From 812c0c7fe109f9660a61845fe88f4e3acc3f06fc Mon Sep 17 00:00:00 2001
From: fufesou <shuanglongchen@yeah.net>
Date: Thu, 9 Mar 2023 11:54:17 +0800
Subject: [PATCH 1/2] better interval

Signed-off-by: fufesou <shuanglongchen@yeah.net>
---
 flutter/lib/common/widgets/peers_view.dart | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/flutter/lib/common/widgets/peers_view.dart b/flutter/lib/common/widgets/peers_view.dart
index 9c98f24b8..695266fb9 100644
--- a/flutter/lib/common/widgets/peers_view.dart
+++ b/flutter/lib/common/widgets/peers_view.dart
@@ -45,7 +45,7 @@ class _PeersViewState extends State<_PeersView> with WindowListener {
   var _lastChangeTime = DateTime.now();
   var _lastQueryPeers = <String>{};
   var _lastQueryTime = DateTime.now().subtract(const Duration(hours: 1));
-  var _queryCoun = 0;
+  var _queryCount = 0;
   var _exit = false;
 
   late final mobileWidth = () {
@@ -78,12 +78,12 @@ class _PeersViewState extends State<_PeersView> with WindowListener {
 
   @override
   void onWindowFocus() {
-    _queryCoun = 0;
+    _queryCount = 0;
   }
 
   @override
   void onWindowMinimize() {
-    _queryCoun = _maxQueryCount;
+    _queryCount = _maxQueryCount;
   }
 
   @override
@@ -149,6 +149,7 @@ class _PeersViewState extends State<_PeersView> with WindowListener {
   // ignore: todo
   // TODO: variables walk through async tasks?
   void _startCheckOnlines() {
+    final queryInterval = const Duration(seconds: 20);
     () async {
       while (!_exit) {
         final now = DateTime.now();
@@ -158,18 +159,18 @@ class _PeersViewState extends State<_PeersView> with WindowListener {
               platformFFI.ffiBind
                   .queryOnlines(ids: _curPeers.toList(growable: false));
               _lastQueryPeers = {..._curPeers};
-              _lastQueryTime = DateTime.now();
-              _queryCoun = 0;
+              _lastQueryTime = DateTime.now().subtract(queryInterval);
+              _queryCount = 0;
             }
           }
         } else {
-          if (_queryCoun < _maxQueryCount) {
-            if (now.difference(_lastQueryTime) > const Duration(seconds: 20)) {
+          if (_queryCount < _maxQueryCount) {
+            if (now.difference(_lastQueryTime) > queryInterval) {
               if (_curPeers.isNotEmpty) {
                 platformFFI.ffiBind
                     .queryOnlines(ids: _curPeers.toList(growable: false));
                 _lastQueryTime = DateTime.now();
-                _queryCoun += 1;
+                _queryCount += 1;
               }
             }
           }

From b566251986c567f91cc0c4c90099b83f101da9ee Mon Sep 17 00:00:00 2001
From: fufesou <shuanglongchen@yeah.net>
Date: Thu, 9 Mar 2023 13:07:56 +0800
Subject: [PATCH 2/2] fix peer online state

Signed-off-by: fufesou <shuanglongchen@yeah.net>
---
 flutter/lib/common/widgets/peers_view.dart | 27 +++++++++++++---------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/flutter/lib/common/widgets/peers_view.dart b/flutter/lib/common/widgets/peers_view.dart
index 695266fb9..720e6727c 100644
--- a/flutter/lib/common/widgets/peers_view.dart
+++ b/flutter/lib/common/widgets/peers_view.dart
@@ -100,6 +100,19 @@ class _PeersViewState extends State<_PeersView> with WindowListener {
     );
   }
 
+  onVisibilityChanged(VisibilityInfo info) {
+    final peerId = _peerId((info.key as ValueKey).value);
+    if (info.visibleFraction > 0.00001) {
+      _curPeers.add(peerId);
+    } else {
+      _curPeers.remove(peerId);
+    }
+    _lastChangeTime = DateTime.now();
+  }
+
+  String _cardId(String id) => widget.peers.name + id;
+  String _peerId(String cardId) => cardId.replaceAll(widget.peers.name, '');
+
   Widget _buildPeersView(Peers peers) {
     final body = ObxValue<RxString>((searchText) {
       return FutureBuilder<List<Peer>>(
@@ -109,16 +122,8 @@ class _PeersViewState extends State<_PeersView> with WindowListener {
             final cards = <Widget>[];
             for (final peer in peers) {
               final visibilityChild = VisibilityDetector(
-                key: ValueKey(peer.id),
-                onVisibilityChanged: (info) {
-                  final peerId = (info.key as ValueKey).value;
-                  if (info.visibleFraction > 0.00001) {
-                    _curPeers.add(peerId);
-                  } else {
-                    _curPeers.remove(peerId);
-                  }
-                  _lastChangeTime = DateTime.now();
-                },
+                key: ValueKey(_cardId(peer.id)),
+                onVisibilityChanged: onVisibilityChanged,
                 child: widget.peerCardBuilder(peer),
               );
               cards.add(isDesktop
@@ -165,7 +170,7 @@ class _PeersViewState extends State<_PeersView> with WindowListener {
           }
         } else {
           if (_queryCount < _maxQueryCount) {
-            if (now.difference(_lastQueryTime) > queryInterval) {
+            if (now.difference(_lastQueryTime) >= queryInterval) {
               if (_curPeers.isNotEmpty) {
                 platformFFI.ffiBind
                     .queryOnlines(ids: _curPeers.toList(growable: false));