konevsa/rustdesk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #4878 from 21pages/fix_chat

Browse Source 
Fix chat
This commit is contained in:
RustDesk 2023-07-05 22:26:48 +08:00 committed by GitHub
commit 3dfe8b27e1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 76 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
flutter/lib/common.dart
View File

@ -545,16 +545,25 @@ closeConnection({String? id}) {
}
}
void window_on_top(int? id) {
void window_on_top(int? id) async {
if (!isDesktop) {
return;
}
if (id == null) {
print("Bring window on top");
// main window
windowManager.restore();
windowManager.show();
windowManager.focus();
if (desktopType == DesktopType.cm &&
!(await windowManager.isMinimized() ||
!await windowManager.isVisible())) {
await windowManager.setAlwaysOnTop(true);
Future.delayed(Duration(microseconds: 500), () async {
windowManager.setAlwaysOnTop(false);
});
} else {
windowManager.restore();
windowManager.show();
windowManager.focus();
}
rustDeskWinManager.registerActiveWindow(kWindowMainId);
} else {
WindowController.fromWindowId(id)
@ -2101,3 +2110,33 @@ Future<void> start_service(bool is_start) async {
bind.mainSetOption(key: "stop-service", value: is_start ? "" : "Y");
}
}
typedef Future<bool> WhetherUseRemoteBlock();
Widget buildRemoteBlock({required Widget child, WhetherUseRemoteBlock? use}) {
var block = false.obs;
return Obx(() => MouseRegion(
onEnter: (_) async {
if (use != null && !await use()) {
block.value = false;
return;
}
var time0 = DateTime.now().millisecondsSinceEpoch;
await bind.mainCheckMouseTime();
Timer(const Duration(milliseconds: 120), () async {
var d = time0 - await bind.mainGetMouseTime();
if (d < 120) {
block.value = true;
}
});
},
onExit: (event) => block.value = false,
child: Stack(children: [
child,
Offstage(
offstage: !block.value,
child: Container(
color: Colors.black.withOpacity(0.5),
)),
]),
));
}

22
flutter/lib/desktop/pages/server_page.dart
View File

@ -160,8 +160,22 @@ class ConnectionManagerState extends State<ConnectionManager> {
child: label),
Obx(() => Offstage(
offstage:
!(client?.hasUnreadChatMessage.value ?? false),
child: Icon(Icons.circle, color: Colors.red, size: 10)))
!((client?.unreadChatMessageCount.value ?? 0) > 0),
child: Container(
width: 16,
height: 16,
decoration: BoxDecoration(
color: Colors.red,
shape: BoxShape.circle,
),
child: Center(
child: Text(
"${client?.unreadChatMessageCount.value ?? 0}",
maxLines: 1,
style: TextStyle(
color: Colors.white, fontSize: 10)),
),
).marginOnly(left: 4)))
],
);
},
@ -170,7 +184,9 @@ class ConnectionManagerState extends State<ConnectionManager> {
Consumer<ChatModel>(
builder: (_, model, child) => model.isShowCMChatPage
? Expanded(
child: ChatPage(),
child: buildRemoteBlock(
child: ChatPage(),
),
flex: (kConnectionManagerWindowSizeOpenChat.width -
kConnectionManagerWindowSizeClosedChat
.width)

41
flutter/lib/desktop/widgets/tabbar_widget.dart
View File

@ -295,37 +295,16 @@ class DesktopTab extends StatelessWidget {
if (tabType != DesktopTabType.main) {
return child;
}
var block = false.obs;
return Obx(() => MouseRegion(
onEnter: (_) async {
var access_mode = await bind.mainGetOption(key: 'access-mode');
var option = option2bool(
'allow-remote-config-modification',
await bind.mainGetOption(
key: 'allow-remote-config-modification'));
if (access_mode == 'view' || (access_mode.isEmpty && !option)) {
var time0 = DateTime.now().millisecondsSinceEpoch;
await bind.mainCheckMouseTime();
Timer(const Duration(milliseconds: 120), () async {
var d = time0 - await bind.mainGetMouseTime();
if (d < 120) {
block.value = true;
}
});
}
},
onExit: (_) => block.value = false,
child: Stack(
children: [
child,
Offstage(
offstage: !block.value,
child: Container(
color: Colors.black.withOpacity(0.5),
)),
],
),
));
return buildRemoteBlock(
child: child,
use: () async {
var access_mode = await bind.mainGetOption(key: 'access-mode');
var option = option2bool(
'allow-remote-config-modification',
await bind.mainGetOption(
key: 'allow-remote-config-modification'));
return access_mode == 'view' || (access_mode.isEmpty && !option);
});
}
List<Widget> _tabWidgets = [];

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

@ -318,7 +318,7 @@ class ChatModel with ChangeNotifier {
final currentSelectedTab =
session.serverModel.tabController.state.value.selectedTabInfo;
if (currentSelectedTab.key != id.toString() && inputNode.hasFocus) {
client.hasUnreadChatMessage.value = true;
client.unreadChatMessageCount.value += 1;
} else {
parent.target?.serverModel.jumpTo(id);
toId = id;

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

@ -463,8 +463,8 @@ class ServerModel with ChangeNotifier {
label: client.name,
closable: false,
onTap: () {
if (client.hasUnreadChatMessage.value) {
client.hasUnreadChatMessage.value = false;
if (client.unreadChatMessageCount.value > 0) {
client.unreadChatMessageCount.value = 0;
final chatModel = parent.target!.chatModel;
chatModel.showChatPage(client.id);
}
@ -643,7 +643,7 @@ class Client {
bool inVoiceCall = false;
bool incomingVoiceCall = false;
RxBool hasUnreadChatMessage = false.obs;
RxInt unreadChatMessageCount = 0.obs;
Client(this.id, this.authorized, this.isFileTransfer, this.name, this.peerId,
this.keyboard, this.clipboard, this.audio);