lee/rustdesk
1
0
Fork 0
mirror of https://github.com/rustdesk/rustdesk.git synced 2025-12-12 11:06:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4934 from 21pages/fix_chat

Browse Source 
opt mobile chat page
This commit is contained in:
RustDesk
2023-07-10 13:27:09 +08:00
committed by GitHub
parent e1bd925877 6c6f6c081e
commit 8028b23086
11 changed files with 222 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

184
flutter/lib/models/chat_model.dart
View File

@@ -7,6 +7,7 @@ import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:flutter_hbb/common/shared_state.dart';
import 'package:flutter_hbb/desktop/widgets/tabbar_widget.dart';
import 'package:flutter_hbb/mobile/pages/home_page.dart';
import 'package:flutter_hbb/models/platform_model.dart';
import 'package:flutter_hbb/models/state_model.dart';
import 'package:get/get_rx/src/rx_types/rx_types.dart';
@@ -20,6 +21,24 @@ import '../common/widgets/overlay.dart';
import '../main.dart';
import 'model.dart';
class MessageKey {
final String peerId;
final int connId;
bool get isOut => connId != ChatModel.clientModeID;
MessageKey(this.peerId, this.connId);
@override
bool operator ==(other) {
return other is MessageKey &&
other.peerId == peerId &&
other.isOut == isOut;
}
@override
int get hashCode => peerId.hashCode ^ isOut.hashCode;
}
class MessageBody {
ChatUser chatUser;
List<ChatMessage> chatMessages;
@@ -49,6 +68,7 @@ class ChatModel with ChangeNotifier {
Rx<VoiceCallStatus> get voiceCallStatus => _voiceCallStatus;
TextEditingController textController = TextEditingController();
RxInt mobileUnreadSum = 0.obs;
@override
void dispose() {
@@ -61,15 +81,14 @@ class ChatModel with ChangeNotifier {
firstName: translate("Me"),
);
late final Map<int, MessageBody> _messages = {}..[clientModeID] =
MessageBody(me, []);
late final Map<MessageKey, MessageBody> _messages = {};
var _currentID = clientModeID;
MessageKey _currentKey = MessageKey('', clientModeID);
late bool _isShowCMChatPage = false;
Map<int, MessageBody> get messages => _messages;
Map<MessageKey, MessageBody> get messages => _messages;
int get currentID => _currentID;
MessageKey get currentKey => _currentKey;
bool get isShowCMChatPage => _isShowCMChatPage;
@@ -119,15 +138,7 @@ class ChatModel with ChangeNotifier {
);
}
ChatUser get currentUser {
final user = messages[currentID]?.chatUser;
if (user == null) {
_currentID = clientModeID;
return me;
} else {
return user;
}
}
ChatUser? get currentUser => _messages[_currentKey]?.chatUser;
showChatIconOverlay({Offset offset = const Offset(200, 50)}) {
if (chatIconOverlayEntry != null) {
@@ -233,11 +244,11 @@ class ChatModel with ChangeNotifier {
}
}
showChatPage(int id) async {
showChatPage(MessageKey key) async {
if (isDesktop) {
if (isConnManager) {
if (!_isShowCMChatPage) {
await toggleCMChatPage(id);
await toggleCMChatPage(key);
}
} else {
if (_isChatOverlayHide()) {
@@ -245,7 +256,7 @@ class ChatModel with ChangeNotifier {
}
}
} else {
if (id == clientModeID) {
if (key.connId == clientModeID) {
if (_isChatOverlayHide()) {
await toggleChatOverlay();
}
@@ -253,9 +264,9 @@ class ChatModel with ChangeNotifier {
}
}
toggleCMChatPage(int id) async {
if (gFFI.chatModel.currentID != id) {
gFFI.chatModel.changeCurrentID(id);
toggleCMChatPage(MessageKey key) async {
if (gFFI.chatModel.currentKey != key) {
gFFI.chatModel.changeCurrentID(key);
}
if (_isShowCMChatPage) {
_isShowCMChatPage = !_isShowCMChatPage;
@@ -273,25 +284,29 @@ class ChatModel with ChangeNotifier {
}
}
changeCurrentID(int id) {
if (_messages.containsKey(id)) {
_currentID = id;
changeCurrentID(MessageKey key) {
updateConnIdOfKey(key);
if (_messages.containsKey(key)) {
_currentKey = key;
notifyListeners();
} else {
final client = parent.target?.serverModel.clients
.firstWhere((client) => client.id == id);
if (client == null) {
return debugPrint(
"Failed to changeCurrentID,remote user doesn't exist");
String? peerName;
if (key.connId == clientModeID) {
peerName = parent.target?.ffiModel.pi.username;
} else {
peerName = parent.target?.serverModel.clients
.firstWhereOrNull((client) => client.peerId == key.peerId)
?.name;
}
final chatUser = ChatUser(
id: client.peerId,
firstName: client.name,
id: key.peerId,
firstName: peerName,
);
_messages[id] = MessageBody(chatUser, []);
_currentID = id;
_messages[key] = MessageBody(chatUser, []);
_currentKey = key;
notifyListeners();
}
mobileClearClientUnread(key.connId);
}
receive(int id, String text) async {
@@ -304,23 +319,33 @@ class ChatModel with ChangeNotifier {
if (desktopType == DesktopType.cm) {
await showCmWindow();
}
String? peerId;
if (id == clientModeID) {
peerId = session.id;
} else {
peerId = session.serverModel.clients
.firstWhereOrNull((e) => e.id == id)
?.peerId;
}
if (peerId == null) {
debugPrint("Failed to receive msg, peerId is null");
return;
}
final messagekey = MessageKey(peerId, id);
// mobile: first message show overlay icon
if (!isDesktop && chatIconOverlayEntry == null) {
if (!isDesktop && chatIconOverlayEntry == null && id == clientModeID) {
showChatIconOverlay();
}
// show chat page
await showChatPage(id);
int toId = currentID;
await showChatPage(messagekey);
late final ChatUser chatUser;
if (id == clientModeID) {
chatUser = ChatUser(
firstName: session.ffiModel.pi.username,
id: session.id,
id: peerId,
);
toId = id;
if (isDesktop) {
if (Get.isRegistered<DesktopTabController>()) {
@@ -339,14 +364,18 @@ class ChatModel with ChangeNotifier {
}
} else {
if (notSelected) {
UnreadChatCountState.find(session.id).value += 1;
UnreadChatCountState.find(peerId).value += 1;
}
}
}
}
} else {
final client =
session.serverModel.clients.firstWhere((client) => client.id == id);
final client = session.serverModel.clients
.firstWhereOrNull((client) => client.id == id);
if (client == null) {
debugPrint("Failed to receive msg, client is null");
return;
}
if (isDesktop) {
window_on_top(null);
// disable auto jumpTo other tab when hasFocus, and mark unread message
@@ -356,20 +385,23 @@ class ChatModel with ChangeNotifier {
client.unreadChatMessageCount.value += 1;
} else {
parent.target?.serverModel.jumpTo(id);
toId = id;
}
} else {
toId = id;
if (HomePage.homeKey.currentState?.selectedIndex != 1 ||
_currentKey.peerId != client.peerId) {
client.unreadChatMessageCount.value += 1;
mobileUpdateUnreadSum();
}
}
chatUser = ChatUser(id: client.peerId, firstName: client.name);
}
if (!_messages.containsKey(id)) {
_messages[id] = MessageBody(chatUser, []);
}
_messages[id]!.insert(
insertMessage(messagekey,
ChatMessage(text: text, user: chatUser, createdAt: DateTime.now()));
_currentID = toId;
if (id == clientModeID || _currentKey.peerId.isEmpty) {
// Invalid
_currentKey = messagekey;
mobileClearClientUnread(messagekey.connId);
}
notifyListeners();
}
@@ -379,17 +411,63 @@ class ChatModel with ChangeNotifier {
return;
}
message.text = trimmedText;
_messages[_currentID]?.insert(message);
if (_currentID == clientModeID && parent.target != null) {
insertMessage(_currentKey, message);
if (_currentKey.connId == clientModeID && parent.target != null) {
bind.sessionSendChat(sessionId: sessionId, text: message.text);
} else {
bind.cmSendChat(connId: _currentID, msg: message.text);
bind.cmSendChat(connId: _currentKey.connId, msg: message.text);
}
notifyListeners();
inputNode.requestFocus();
}
insertMessage(MessageKey key, ChatMessage message) {
updateConnIdOfKey(key);
if (!_messages.containsKey(key)) {
_messages[key] = MessageBody(message.user, []);
}
_messages[key]?.insert(message);
}
updateConnIdOfKey(MessageKey key) {
if (_messages.keys
.toList()
.firstWhereOrNull((e) => e == key && e.connId != key.connId) !=
null) {
final old = _messages.remove(key);
if (old != null) {
_messages[key] = old;
}
}
if (_currentKey == key) {
_currentKey = key; // hash != assign
}
}
void mobileUpdateUnreadSum() {
if (!isMobile) return;
var sum = 0;
parent.target?.serverModel.clients
.map((e) => sum += e.unreadChatMessageCount.value)
.toList();
Future.delayed(Duration.zero, () {
mobileUnreadSum.value = sum;
});
}
void mobileClearClientUnread(int id) {
if (!isMobile) return;
final client = parent.target?.serverModel.clients
.firstWhereOrNull((client) => client.id == id);
if (client != null) {
Future.delayed(Duration.zero, () {
client.unreadChatMessageCount.value = 0;
mobileUpdateUnreadSum();
});
}
}
close() {
hideChatIconOverlay();
hideChatWindowOverlay();

3
flutter/lib/models/server_model.dart
View File

@@ -5,6 +5,7 @@ import 'dart:io';
import 'package:flutter/material.dart';
import 'package:flutter_hbb/consts.dart';
import 'package:flutter_hbb/main.dart';
import 'package:flutter_hbb/models/chat_model.dart';
import 'package:flutter_hbb/models/platform_model.dart';
import 'package:get/get.dart';
import 'package:wakelock/wakelock.dart';
@@ -474,6 +475,8 @@ class ServerModel with ChangeNotifier {
cmHiddenTimer = null;
});
}
parent.target?.chatModel
.updateConnIdOfKey(MessageKey(client.peerId, client.id));
}
void showLoginDialog(Client client) {