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

split waiting for image

Browse Source 
Signed-off-by: 21pages <pages21@163.com>
This commit is contained in:
21pages 2023-08-07 09:51:05 +08:00
parent 186f5ed39c
commit a8cddb5b19
1 changed files with 34 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
flutter/lib/models/model.dart
View File

@ -37,7 +37,8 @@ import 'platform_model.dart';
typedef HandleMsgBox = Function(Map<String, dynamic> evt, String id); typedef HandleMsgBox = Function(Map<String, dynamic> evt, String id);
typedef ReconnectHandle = Function(OverlayDialogManager, SessionID, bool); typedef ReconnectHandle = Function(OverlayDialogManager, SessionID, bool);
final _waitForImage = <UuidValue, bool>{}; final _waitForImageDialogShow = <UuidValue, bool>{};
final _waitForFirstImage = <UuidValue, bool>{};
final _constSessionId = Uuid().v4obj(); final _constSessionId = Uuid().v4obj();
class FfiModel with ChangeNotifier { class FfiModel with ChangeNotifier {
@ -424,7 +425,8 @@ class FfiModel with ChangeNotifier {
closeConnection(); closeConnection();
} }
dialogManager.show( Future.delayed(Duration.zero, () async {
await dialogManager.show(
(setState, close, context) => CustomAlertDialog( (setState, close, context) => CustomAlertDialog(
title: null, title: null,
content: SelectionArea(child: msgboxContent(type, title, text)), content: SelectionArea(child: msgboxContent(type, title, text)),
@ -434,7 +436,8 @@ class FfiModel with ChangeNotifier {
onCancel: onClose), onCancel: onClose),
tag: '$sessionId-waiting-for-image', tag: '$sessionId-waiting-for-image',
); );
_waitForImage[sessionId] = true; _waitForImageDialogShow[sessionId] = true;
});
} }
_updateSessionWidthHeight(SessionID sessionId) { _updateSessionWidthHeight(SessionID sessionId) {
@ -500,6 +503,7 @@ class FfiModel with ChangeNotifier {
} }
if (displays.isNotEmpty) { if (displays.isNotEmpty) {
_reconnects = 1; _reconnects = 1;
_waitForFirstImage[sessionId] = true;
} }
Map<String, dynamic> features = json.decode(evt['features']); Map<String, dynamic> features = json.decode(evt['features']);
_pi.features.privacyMode = features['privacy_mode'] == 1; _pi.features.privacyMode = features['privacy_mode'] == 1;
@ -644,24 +648,6 @@ class ImageModel with ChangeNotifier {
addCallbackOnFirstImage(Function(String) cb) => callbacksOnFirstImage.add(cb); addCallbackOnFirstImage(Function(String) cb) => callbacksOnFirstImage.add(cb);
onRgba(Uint8List rgba) { onRgba(Uint8List rgba) {
final waitforImage = _waitForImage[sessionId];
if (waitforImage == null) {
debugPrint('Exception, peer $id not found for waiting image');
return;
}
if (waitforImage == true) {
_waitForImage[sessionId] = false;
parent.target?.dialogManager.dismissAll();
clearWaitingForImage(parent.target?.dialogManager, sessionId);
if (isDesktop) {
for (final cb in callbacksOnFirstImage) {
cb(id);
}
}
}
final pid = parent.target?.id; final pid = parent.target?.id;
img.decodeImageFromPixels( img.decodeImageFromPixels(
rgba, rgba,
@ -1702,16 +1688,7 @@ class FFI {
} }
} else if (message is EventToUI_Rgba) { } else if (message is EventToUI_Rgba) {
if (useTextureRender) { if (useTextureRender) {
if (_waitForImage[sessionId] != false) { onEvent2UIRgba();
_waitForImage[sessionId] = false;
dialogManager.dismissAll();
for (final cb in imageModel.callbacksOnFirstImage) {
cb(id);
}
await canvasModel.updateViewStyle();
await canvasModel.updateScrollStyle();
clearWaitingForImage(dialogManager, sessionId);
}
} else { } else {
// Fetch the image buffer from rust codes. // Fetch the image buffer from rust codes.
final sz = platformFFI.getRgbaSize(sessionId); final sz = platformFFI.getRgbaSize(sessionId);
@ -1720,6 +1697,7 @@ class FFI {
} }
final rgba = platformFFI.getRgba(sessionId, sz); final rgba = platformFFI.getRgba(sessionId, sz);
if (rgba != null) { if (rgba != null) {
onEvent2UIRgba();
imageModel.onRgba(rgba); imageModel.onRgba(rgba);
} }
} }
@ -1730,6 +1708,22 @@ class FFI {
this.id = id; this.id = id;
} }
void onEvent2UIRgba() async {
if (_waitForImageDialogShow[sessionId] == true) {
_waitForImageDialogShow[sessionId] = false;
clearWaitingForImage(dialogManager, sessionId);
}
if (_waitForFirstImage[sessionId] == true) {
_waitForFirstImage[sessionId] = false;
dialogManager.dismissAll();
await canvasModel.updateViewStyle();
await canvasModel.updateScrollStyle();
for (final cb in imageModel.callbacksOnFirstImage) {
cb(id);
}
}
}
/// Login with [password], choose if the client should [remember] it. /// Login with [password], choose if the client should [remember] it.
void login(String osUsername, String osPassword, SessionID sessionId, void login(String osUsername, String osPassword, SessionID sessionId,
String password, bool remember) { String password, bool remember) {