Nachrichten Popup und Positionsmarker im mobilen View
This commit is contained in:
1 parent
6e24c79008
commit
18278fdf43
4 files changed
+211
-49
No files matched your search
@@ -2539,10 +2539,12 @@ function openChat(groupId) {
|
||||
dispatcherState.chatGroupId = Number(groupId);
|
||||
renderChat();
|
||||
const dialog = document.getElementById('chatModal');
|
||||
if (dialog && typeof dialog.showModal === 'function') {
|
||||
dialog.showModal();
|
||||
} else if (dialog) {
|
||||
dialog.show();
|
||||
if (dialog && !dialog.open) {
|
||||
if (typeof dialog.showModal === 'function') {
|
||||
dialog.showModal();
|
||||
} else {
|
||||
dialog.show();
|
||||
}
|
||||
}
|
||||
const container = document.getElementById('chatMessages');
|
||||
if (container) {
|
||||
@@ -2850,10 +2852,12 @@ function showInfoMessage(message) {
|
||||
|
||||
renderInfoMessages();
|
||||
|
||||
if (typeof dialog.showModal === 'function') {
|
||||
dialog.showModal();
|
||||
} else {
|
||||
dialog.show();
|
||||
if (!dialog.open) {
|
||||
if (typeof dialog.showModal === 'function') {
|
||||
dialog.showModal();
|
||||
} else {
|
||||
dialog.show();
|
||||
}
|
||||
}
|
||||
const container = document.getElementById('infoMessages');
|
||||
if (container) {
|
||||
@@ -2948,7 +2952,12 @@ function handleGroupChatMessage(message) {
|
||||
const payload = parsePayload(message.msg) || {};
|
||||
const groupId = Number(payload.group_id ?? message.receiver_id);
|
||||
const group = dispatcherState.groupById.get(groupId);
|
||||
if (!group) return;
|
||||
if (!group) {
|
||||
if (Number(message.sender_id) !== currentAccountId) {
|
||||
showInfoMessage(message);
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
const text = extractMessageText(payload.text ?? payload.msg ?? '');
|
||||
|
||||
@@ -2963,6 +2972,11 @@ function handleGroupChatMessage(message) {
|
||||
ts: normalizeTimestamp(message.ts) || Date.now(),
|
||||
text
|
||||
});
|
||||
|
||||
if (Number(message.sender_id) !== currentAccountId) {
|
||||
playNotificationSound();
|
||||
openChat(group.id);
|
||||
}
|
||||
}
|
||||
|
||||
/* ------------------------------------------------------------------ */
|
||||
@@ -3160,8 +3174,9 @@ function handleWsMessage(event) {
|
||||
break;
|
||||
}
|
||||
case 1100: {
|
||||
const groupId = Number(message.receiver_id) || Number((message.msg && typeof message.msg === 'object' && message.msg.group_id));
|
||||
const text = extractMessageText(message.msg);
|
||||
const payload = parsePayload(message.msg) || {};
|
||||
const groupId = Number(message.receiver_id) || Number(payload.group_id);
|
||||
const text = extractMessageText(payload.text ?? message.msg);
|
||||
if (window.CMBNET_VIEW_MODE !== 'observer') {
|
||||
if (groupId) {
|
||||
addChatMessage(groupId, {
|
||||
@@ -3181,13 +3196,18 @@ function handleWsMessage(event) {
|
||||
ts: message.ts
|
||||
});
|
||||
} else if (Number(message.sender_id) !== currentAccountId) {
|
||||
showInfoMessage({
|
||||
code: message.code,
|
||||
sender_id: message.sender_id,
|
||||
receiver_id: groupId || message.receiver_id,
|
||||
msg: text,
|
||||
ts: message.ts
|
||||
});
|
||||
playNotificationSound();
|
||||
if (groupId) {
|
||||
openChat(groupId);
|
||||
} else {
|
||||
showInfoMessage({
|
||||
code: message.code,
|
||||
sender_id: message.sender_id,
|
||||
receiver_id: message.receiver_id,
|
||||
msg: text,
|
||||
ts: message.ts
|
||||
});
|
||||
}
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user