feat: add single/multi window manager wrapper & fix issue causing input twice

This commit is contained in:
Kingtous
2022-05-29 17:19:50 +08:00
parent 24a6846f03
commit 708801bdf6
12 changed files with 1817 additions and 175 deletions

View File

@@ -1,15 +1,14 @@
import 'package:flutter/material.dart';
import 'package:flutter_hbb/mobile/pages/file_manager_page.dart';
import 'package:flutter_hbb/utils/multi_window_manager.dart';
import 'package:provider/provider.dart';
import 'package:url_launcher/url_launcher.dart';
import 'dart:async';
import '../../common.dart';
import '../../models/model.dart';
import '../../mobile/pages/home_page.dart';
import '../../mobile/pages/remote_page.dart';
import '../../mobile/pages/settings_page.dart';
import '../../mobile/pages/scan_page.dart';
import '../../models/server_model.dart';
import '../../mobile/pages/settings_page.dart';
import '../../models/model.dart';
/// Connection page for connecting to a remote peer.
class ConnectionPage extends StatefulWidget implements PageShape {
@@ -46,7 +45,6 @@ class _ConnectionPageState extends State<ConnectionPage> {
Widget build(BuildContext context) {
Provider.of<FfiModel>(context);
if (_idController.text.isEmpty) _idController.text = FFI.getId();
FFI.serverModel.startService();
return SingleChildScrollView(
child: Column(
mainAxisAlignment: MainAxisAlignment.start,
@@ -55,7 +53,7 @@ class _ConnectionPageState extends State<ConnectionPage> {
children: <Widget>[
getUpdateUI(),
getSearchBarUI(),
Container(height: 12),
SizedBox(height: 12),
getPeers(),
]),
);
@@ -86,12 +84,15 @@ class _ConnectionPageState extends State<ConnectionPage> {
),
);
} else {
Navigator.push(
context,
MaterialPageRoute(
builder: (BuildContext context) => RemotePage(id: id),
),
);
// single window
// Navigator.push(
// context,
// MaterialPageRoute(
// builder: (BuildContext context) => RemotePage(id: id),
// ),
// );
// multi window
await rustDeskWinManager.new_remote_desktop(id);
}
FocusScopeNode currentFocus = FocusScope.of(context);
if (!currentFocus.hasPrimaryFocus) {

View File

@@ -0,0 +1,66 @@
import 'dart:convert';
import 'package:flutter/material.dart';
import 'package:flutter_hbb/desktop/pages/remote_page.dart';
import 'package:flutter_hbb/models/model.dart';
import 'package:flutter_hbb/utils/multi_window_manager.dart';
class ConnectionTabPage extends StatefulWidget {
final Map<String, dynamic> params;
const ConnectionTabPage({Key? key, required this.params}) : super(key: key);
@override
State<ConnectionTabPage> createState() => _ConnectionTabPageState(params);
}
class _ConnectionTabPageState extends State<ConnectionTabPage>
with SingleTickerProviderStateMixin {
// refactor List<int> when using multi-tab
// this singleton is only for test
late String connectionId;
late TabController tabController;
_ConnectionTabPageState(Map<String, dynamic> params) {
connectionId = params['id'] ?? "";
}
@override
void initState() {
super.initState();
rustDeskWinManager.setMethodHandler((call, fromWindowId) async {
print(
"call ${call.method} with args ${call.arguments} from window ${fromWindowId}");
// for simplify, just replace connectionId
if (call.method == "new_remote_desktop") {
setState(() {
FFI.close();
connectionId = jsonDecode(call.arguments)["id"];
});
}
});
tabController = TabController(length: 1, vsync: this);
}
@override
Widget build(BuildContext context) {
return Column(
children: [
TabBar(
controller: tabController,
isScrollable: true,
labelColor: Colors.black87,
physics: NeverScrollableScrollPhysics(),
tabs: [
Tab(
text: connectionId,
),
]),
Expanded(
child: TabBarView(controller: tabController, children: [
RemotePage(key: ValueKey(connectionId), id: connectionId)
]))
],
);
}
}

View File

@@ -55,8 +55,8 @@ class _DesktopHomePageState extends State<DesktopHomePage> {
return Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
buildControlPanel(context),
buildRecentSession(context),
// buildControlPanel(context),
// buildRecentSession(context),
ConnectionPage()
],
);

File diff suppressed because it is too large Load Diff

View File

@@ -0,0 +1,46 @@
import 'package:flutter/material.dart';
import 'package:flutter_hbb/common.dart';
import 'package:flutter_hbb/desktop/pages/connection_tab_page.dart';
import 'package:flutter_hbb/models/model.dart';
import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
import 'package:provider/provider.dart';
/// multi-tab desktop remote screen
class DesktopRemoteScreen extends StatelessWidget {
final Map<String, dynamic> params;
const DesktopRemoteScreen({Key? key, required this.params}) : super(key: key);
@override
Widget build(BuildContext context) {
return MultiProvider(
providers: [
ChangeNotifierProvider.value(value: FFI.ffiModel),
ChangeNotifierProvider.value(value: FFI.imageModel),
ChangeNotifierProvider.value(value: FFI.cursorModel),
ChangeNotifierProvider.value(value: FFI.canvasModel),
],
child: MaterialApp(
navigatorKey: globalKey,
debugShowCheckedModeBanner: false,
title: 'RustDesk - Remote Desktop',
theme: ThemeData(
primarySwatch: Colors.blue,
visualDensity: VisualDensity.adaptivePlatformDensity,
),
home: ConnectionTabPage(
params: params,
),
navigatorObservers: [
// FirebaseAnalyticsObserver(analytics: analytics),
FlutterSmartDialog.observer
],
builder: FlutterSmartDialog.init(
builder: isAndroid
? (_, child) => AccessibilityListener(
child: child,
)
: null)),
);
}
}