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

fix small

Browse Source
This commit is contained in:
csf 2022-02-24 18:24:52 +08:00
parent 725b916392
commit 18a9837dc9
2 changed files with 23 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/main.dart
View File

@ -11,7 +11,7 @@ import 'server_page.dart';
Future<Null> main() async { Future<Null> main() async {
WidgetsFlutterBinding.ensureInitialized(); WidgetsFlutterBinding.ensureInitialized();
await Firebase.initializeApp(); await Firebase.initializeApp();
// EasyLoading.instance.loadingStyle = EasyLoadingStyle.light; EasyLoading.instance.loadingStyle = EasyLoadingStyle.light;
toAndroidChannelInit(); toAndroidChannelInit();
runApp(App()); runApp(App());
} }

35
lib/remote_page.dart
View File

@ -1,4 +1,5 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_easyloading/flutter_easyloading.dart';
import 'package:flutter_hbb/widgets/gesture_help.dart'; import 'package:flutter_hbb/widgets/gesture_help.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
import 'package:flutter/services.dart'; import 'package:flutter/services.dart';
@ -41,7 +42,7 @@ class _RemotePageState extends State<RemotePage> {
super.initState(); super.initState();
FFI.connect(widget.id); FFI.connect(widget.id);
WidgetsBinding.instance!.addPostFrameCallback((_) { WidgetsBinding.instance!.addPostFrameCallback((_) {
SystemChrome.setEnabledSystemUIOverlays([]); SystemChrome.setEnabledSystemUIMode(SystemUiMode.manual, overlays: []);
showLoading(translate('Connecting...'), context); showLoading(translate('Connecting...'), context);
_interval = _interval =
Timer.periodic(Duration(milliseconds: 30), (timer) => interval()); Timer.periodic(Duration(milliseconds: 30), (timer) => interval());
@ -57,7 +58,8 @@ class _RemotePageState extends State<RemotePage> {
_interval?.cancel(); _interval?.cancel();
_timer?.cancel(); _timer?.cancel();
dismissLoading(); dismissLoading();
SystemChrome.setEnabledSystemUIOverlays(SystemUiOverlay.values); SystemChrome.setEnabledSystemUIMode(SystemUiMode.manual,
overlays: SystemUiOverlay.values);
Wakelock.disable(); Wakelock.disable();
super.dispose(); super.dispose();
} }
@ -70,7 +72,7 @@ class _RemotePageState extends State<RemotePage> {
return _bottom >= 100; return _bottom >= 100;
} }
// crash on web before widgit initiated. // crash on web before widget initiated.
void intervalUnsafe() { void intervalUnsafe() {
var v = MediaQuery.of(context).viewInsets.bottom; var v = MediaQuery.of(context).viewInsets.bottom;
if (v != _bottom) { if (v != _bottom) {
@ -78,11 +80,12 @@ class _RemotePageState extends State<RemotePage> {
setState(() { setState(() {
_bottom = v; _bottom = v;
if (v < 100) { if (v < 100) {
SystemChrome.setEnabledSystemUIOverlays([]); SystemChrome.setEnabledSystemUIMode(SystemUiMode.manual,
overlays: []);
} }
}); });
} }
FFI.ffiModel.update(widget.id, context, handleMsgbox); FFI.ffiModel.update(widget.id, context, handleMsgBox);
} }
void interval() { void interval() {
@ -91,7 +94,7 @@ class _RemotePageState extends State<RemotePage> {
} catch (e) {} } catch (e) {}
} }
void handleMsgbox(Map<String, dynamic> evt, String id) { void handleMsgBox(Map<String, dynamic> evt, String id) {
var type = evt['type']; var type = evt['type'];
var title = evt['title']; var title = evt['title'];
var text = evt['text']; var text = evt['text'];
@ -208,7 +211,8 @@ class _RemotePageState extends State<RemotePage> {
setState(() => _showEdit = true); setState(() => _showEdit = true);
_timer?.cancel(); _timer?.cancel();
_timer = Timer(Duration(milliseconds: 30), () { _timer = Timer(Duration(milliseconds: 30), () {
SystemChrome.setEnabledSystemUIOverlays(SystemUiOverlay.values); SystemChrome.setEnabledSystemUIMode(SystemUiMode.manual,
overlays: SystemUiOverlay.values);
SystemChannels.textInput.invokeMethod('TextInput.show'); SystemChannels.textInput.invokeMethod('TextInput.show');
_focusNode.requestFocus(); _focusNode.requestFocus();
}); });
@ -245,12 +249,17 @@ class _RemotePageState extends State<RemotePage> {
}), }),
bottomNavigationBar: bottomNavigationBar:
_showBar && pi.displays != null ? getBottomAppBar() : null, _showBar && pi.displays != null ? getBottomAppBar() : null,
body: Container( body: Overlay(
color: Colors.black, initialEntries: [
child: isDesktop OverlayEntry(builder: (context) {
? getBodyForDesktopWithListener() return Container(
: SafeArea(child: getBodyForMobileWithGesture())), color: Colors.black,
), child: isDesktop
? getBodyForDesktopWithListener()
: SafeArea(child: getBodyForMobileWithGesture()));
})
],
)),
); );
} }