TheLanc3/rustdesk
1
0
Fork 0
mirror of https://github.com/rustdesk/rustdesk.git synced 2026-03-07 20:30:08 +03:00
Code Issues Packages Projects Releases Wiki Activity

feat, update, win, macos (#11618)

Browse Source 
Signed-off-by: fufesou <linlong1266@gmail.com>
This commit is contained in:
fufesou
2025-05-04 07:32:47 +08:00
committed by GitHub
parent 62276b4f4f
commit ca00706a38
72 changed files with 2128 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
flutter/lib/common.dart
View File

@@ -1152,15 +1152,23 @@ Widget createDialogContent(String text) {
void msgBox(SessionID sessionId, String type, String title, String text,
String link, OverlayDialogManager dialogManager,
{bool? hasCancel, ReconnectHandle? reconnect, int? reconnectTimeout}) {
{bool? hasCancel,
ReconnectHandle? reconnect,
int? reconnectTimeout,
VoidCallback? onSubmit,
int? submitTimeout}) {
dialogManager.dismissAll();
List<Widget> buttons = [];
bool hasOk = false;
submit() {
dialogManager.dismissAll();
// https://github.com/rustdesk/rustdesk/blob/5e9a31340b899822090a3731769ae79c6bf5f3e5/src/ui/common.tis#L263
if (!type.contains("custom") && desktopType != DesktopType.portForward) {
closeConnection();
if (onSubmit != null) {
onSubmit.call();
} else {
// https://github.com/rustdesk/rustdesk/blob/5e9a31340b899822090a3731769ae79c6bf5f3e5/src/ui/common.tis#L263
if (!type.contains("custom") && desktopType != DesktopType.portForward) {
closeConnection();
}
}
}
@@ -1176,7 +1184,18 @@ void msgBox(SessionID sessionId, String type, String title, String text,
if (type != "connecting" && type != "success" && !type.contains("nook")) {
hasOk = true;
buttons.insert(0, dialogButton('OK', onPressed: submit));
late final Widget btn;
if (submitTimeout != null) {
btn = _CountDownButton(
text: 'OK',
second: submitTimeout,
onPressed: submit,
submitOnTimeout: true,
);
} else {
btn = dialogButton('OK', onPressed: submit);
}
buttons.insert(0, btn);
}
hasCancel ??= !type.contains("error") &&
!type.contains("nocancel") &&
@@ -1197,7 +1216,8 @@ void msgBox(SessionID sessionId, String type, String title, String text,
reconnectTimeout != null) {
// `enabled` is used to disable the dialog button once the button is clicked.
final enabled = true.obs;
final button = Obx(() => _ReconnectCountDownButton(
final button = Obx(() => _CountDownButton(
text: 'Reconnect',
second: reconnectTimeout,
onPressed: enabled.isTrue
? () {
@@ -3183,21 +3203,24 @@ parseParamScreenRect(Map<String, dynamic> params) {
get isInputSourceFlutter => stateGlobal.getInputSource() == "Input source 2";
class _ReconnectCountDownButton extends StatefulWidget {
_ReconnectCountDownButton({
class _CountDownButton extends StatefulWidget {
_CountDownButton({
Key? key,
required this.text,
required this.second,
required this.onPressed,
this.submitOnTimeout = false,
}) : super(key: key);
final String text;
final VoidCallback? onPressed;
final int second;
final bool submitOnTimeout;
@override
State<_ReconnectCountDownButton> createState() =>
_ReconnectCountDownButtonState();
State<_CountDownButton> createState() => _CountDownButtonState();
}
class _ReconnectCountDownButtonState extends State<_ReconnectCountDownButton> {
class _CountDownButtonState extends State<_CountDownButton> {
late int _countdownSeconds = widget.second;
Timer? _timer;
@@ -3218,6 +3241,9 @@ class _ReconnectCountDownButtonState extends State<_ReconnectCountDownButton> {
_timer = Timer.periodic(Duration(seconds: 1), (timer) {
if (_countdownSeconds <= 0) {
timer.cancel();
if (widget.submitOnTimeout) {
widget.onPressed?.call();
}
} else {
setState(() {
_countdownSeconds--;
@@ -3229,7 +3255,7 @@ class _ReconnectCountDownButtonState extends State<_ReconnectCountDownButton> {
@override
Widget build(BuildContext context) {
return dialogButton(
'${translate('Reconnect')} (${_countdownSeconds}s)',
'${translate(widget.text)} (${_countdownSeconds}s)',
onPressed: widget.onPressed,
isOutline: true,
);