flutter_desktop: fix global envet stream shading && refactor platform ffi

Signed-off-by: fufesou <shuanglongchen@yeah.net>
This commit is contained in:
fufesou
2022-08-03 22:03:31 +08:00
parent d3bc0ca073
commit 7a2de5d280
20 changed files with 476 additions and 398 deletions

View File

@@ -1,5 +1,4 @@
import 'dart:async';
import 'dart:convert';
import 'package:flutter/material.dart';
import 'package:flutter/foundation.dart';
@@ -8,6 +7,7 @@ import 'package:visibility_detector/visibility_detector.dart';
import 'package:window_manager/window_manager.dart';
import '../../models/peer_model.dart';
import '../../models/platform_model.dart';
import '../../common.dart';
import 'peercard_widget.dart';
@@ -116,7 +116,7 @@ class _PeerWidgetState extends State<_PeerWidget> with WindowListener {
if (!setEquals(_curPeers, _lastQueryPeers)) {
if (now.difference(_lastChangeTime) > Duration(seconds: 1)) {
if (_curPeers.length > 0) {
gFFI.ffiModel.platformFFI.ffiBind
platformFFI.ffiBind
.queryOnlines(ids: _curPeers.toList(growable: false));
_lastQueryPeers = {..._curPeers};
_lastQueryTime = DateTime.now();
@@ -127,7 +127,7 @@ class _PeerWidgetState extends State<_PeerWidget> with WindowListener {
if (_queryCoun < _maxQueryCount) {
if (now.difference(_lastQueryTime) > Duration(seconds: 20)) {
if (_curPeers.length > 0) {
gFFI.ffiModel.platformFFI.ffiBind
platformFFI.ffiBind
.queryOnlines(ids: _curPeers.toList(growable: false));
_lastQueryTime = DateTime.now();
_queryCoun += 1;
@@ -169,7 +169,7 @@ class RecentPeerWidget extends BasePeerWidget {
@override
Widget build(BuildContext context) {
final widget = super.build(context);
gFFI.bind.mainLoadRecentPeers();
bind.mainLoadRecentPeers();
return widget;
}
}
@@ -186,7 +186,7 @@ class FavoritePeerWidget extends BasePeerWidget {
@override
Widget build(BuildContext context) {
final widget = super.build(context);
gFFI.bind.mainLoadFavPeers();
bind.mainLoadFavPeers();
return widget;
}
}
@@ -203,7 +203,7 @@ class DiscoveredPeerWidget extends BasePeerWidget {
@override
Widget build(BuildContext context) {
final widget = super.build(context);
gFFI.bind.mainLoadLanPeers();
bind.mainLoadLanPeers();
return widget;
}
}

View File

@@ -5,9 +5,11 @@ import 'package:get/get.dart';
import '../../common.dart';
import '../../models/model.dart';
import '../../models/platform_model.dart';
import '../../models/peer_model.dart';
typedef PopupMenuItemsFunc = Future<List<PopupMenuItem<String>>> Function();
enum PeerType { recent, fav, discovered, ab }
class _PeerCard extends StatefulWidget {
@@ -15,10 +17,11 @@ class _PeerCard extends StatefulWidget {
final PopupMenuItemsFunc popupMenuItemsFunc;
final PeerType type;
_PeerCard({required this.peer,
required this.popupMenuItemsFunc,
Key? key,
required this.type})
_PeerCard(
{required this.peer,
required this.popupMenuItemsFunc,
Key? key,
required this.type})
: super(key: key);
@override
@@ -54,9 +57,10 @@ class _PeerCardState extends State<_PeerCard>
));
}
Widget _buildPeerTile(BuildContext context, Peer peer, Rx<BoxDecoration?> deco) {
Widget _buildPeerTile(
BuildContext context, Peer peer, Rx<BoxDecoration?> deco) {
return Obx(
() => Container(
() => Container(
decoration: deco.value,
child: Column(
mainAxisSize: MainAxisSize.min,
@@ -135,7 +139,7 @@ class _PeerCardState extends State<_PeerCard>
child: CircleAvatar(
radius: 5,
backgroundColor:
peer.online ? Colors.green : Colors.yellow)),
peer.online ? Colors.green : Colors.yellow)),
Text('${peer.id}')
]),
InkWell(
@@ -183,12 +187,13 @@ class _PeerCardState extends State<_PeerCard>
);
if (value == 'remove') {
setState(() => gFFI.setByName('remove', '$id'));
() async {
() async {
removePreference(id);
}();
} else if (value == 'file') {
_connect(id, isFileTransfer: true);
} else if (value == 'add-fav') {} else if (value == 'connect') {
} else if (value == 'add-fav') {
} else if (value == 'connect') {
_connect(id, isFileTransfer: false);
} else if (value == 'ab-delete') {
gFFI.abModel.deletePeer(id);
@@ -199,7 +204,7 @@ class _PeerCardState extends State<_PeerCard>
} else if (value == 'rename') {
_rename(id);
} else if (value == 'unremember-password') {
await gFFI.bind.mainForgetPassword(id: id);
await bind.mainForgetPassword(id: id);
}
}
@@ -220,7 +225,7 @@ class _PeerCardState extends State<_PeerCard>
child: GestureDetector(
onTap: onTap,
child: Obx(
() => Container(
() => Container(
decoration: BoxDecoration(
color: rxTags.contains(tagName) ? Colors.blue : null,
border: Border.all(color: MyTheme.darkGray),
@@ -264,12 +269,12 @@ class _PeerCardState extends State<_PeerCard>
child: Wrap(
children: tags
.map((e) => _buildTag(e, selectedTag, onTap: () {
if (selectedTag.contains(e)) {
selectedTag.remove(e);
} else {
selectedTag.add(e);
}
}))
if (selectedTag.contains(e)) {
selectedTag.remove(e);
} else {
selectedTag.add(e);
}
}))
.toList(growable: false),
),
),