Skip to content

修复引入 减少动画更新 时导致的错误 #227

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
XUANJI233 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

修复引入 减少动画更新 时导致的错误 #227

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
122 changes: 68 additions & 54 deletions lib/screens/main_screen.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,10 @@ class MainScreen extends StatefulWidget {

// MainScreen的状态管理类
class _MainScreenState extends State<MainScreen>
with SingleTickerProviderStateMixin, WidgetsBindingObserver, WindowListener {
with
SingleTickerProviderStateMixin,
WidgetsBindingObserver,
WindowListener {
@override
void initState() {
super.initState();
Expand Down Expand Up @@ -107,13 +110,6 @@ class _MainScreenState extends State<MainScreen>
// 屏幕尺寸变化时更新
final mediaQuery = MediaQuery.of(context);
final screenWidth = mediaQuery.size.width;
final screenHeight = mediaQuery.size.height;

// 记录小窗口状态变化
bool isSmallWindow = screenWidth < 300 || screenHeight < 400;
print(
'Screen size changed: $screenWidth x $screenHeight, isSmallWindow: $isSmallWindow',
);

// 更新分割宽度
ServiceManager().uiState.updateScreenSplitWidth(screenWidth);
Expand Down Expand Up @@ -144,6 +140,18 @@ class _MainScreenState extends State<MainScreen>
_setAppBackground(false);
}

@override
void onWindowEvent(String eventName) {
if (const {'hide', 'minimize', 'blur'}.contains(eventName)) {
_setAppBackground(true);
return;
}

if (const {'show', 'restore', 'focus', 'unminimize'}.contains(eventName)) {
Comment on lines +145 to +150
_setAppBackground(false);
}
}

// 定义导航项列表
List<NavigationItem> get navigationItems => [
NavigationItem(
Expand Down Expand Up @@ -201,59 +209,65 @@ class _MainScreenState extends State<MainScreen>
// 使用安全的索引值，确保不会越界
final safeIndex =
(currentIndex >= 0 && currentIndex < itemCount) ? currentIndex : 0;
final isInBackground = ServiceManager().uiState.isInBackground.value;

// 构建Scaffold组件
return Scaffold(
// 自定义应用栏
appBar: isSmallWindow ? null : StatusBar(),
// 主体内容：使用Row布局
body: Row(
children: [
// 根据是否为桌面端决定是否显示左侧导航
if (ServiceManager().uiState.isDesktop.value && !isSmallWindow)
LeftNav(items: navigationItems, colorScheme: colorScheme),
// 主要内容区域
Expanded(
child: Column(
children: [
// 在小窗口模式下显示简化的状态栏
if (isSmallWindow)
Container(
height: 36,
color: colorScheme.primaryContainer.withOpacity(0.4),
padding: const EdgeInsets.symmetric(horizontal: 8.0),
alignment: Alignment.centerLeft,
child: Text(
safeIndex < navigationItems.length
? navigationItems[safeIndex].label
: '',
style: TextStyle(
fontSize: 16,
fontWeight: FontWeight.bold,
color: colorScheme.onPrimaryContainer,
return TickerMode(
enabled: !isInBackground,
child: Scaffold(
// 自定义应用栏
appBar: isSmallWindow ? null : StatusBar(),
// 主体内容：使用Row布局
body: Row(
children: [
// 根据是否为桌面端决定是否显示左侧导航
if (ServiceManager().uiState.isDesktop.value && !isSmallWindow)
LeftNav(items: navigationItems, colorScheme: colorScheme),
// 主要内容区域
Expanded(
child: Column(
children: [
// 在小窗口模式下显示简化的状态栏
if (isSmallWindow)
Container(
height: 36,
color: colorScheme.primaryContainer.withValues(
alpha: 0.4,
),
padding: const EdgeInsets.symmetric(horizontal: 8.0),
alignment: Alignment.centerLeft,
child: Text(
safeIndex < navigationItems.length
? navigationItems[safeIndex].label
: '',
style: TextStyle(
fontSize: 16,
fontWeight: FontWeight.bold,
color: colorScheme.onPrimaryContainer,
),
),
),
// 主内容区域
Expanded(
child: IndexedStack(
index: safeIndex, // 使用安全的索引
children: _pages, // 页面列表
),
),
// 主内容区域
Expanded(
child: IndexedStack(
index: safeIndex, // 使用安全的索引
children: _pages, // 页面列表
),
),
],
],
),
),
),
],
],
),
// 底部导航栏：在非桌面端或小窗口模式下显示
bottomNavigationBar:
(ServiceManager().uiState.isDesktop.value && !isSmallWindow)
? null
: BottomNav(
navigationItems: navigationItems,
colorScheme: colorScheme,
),
),
// 底部导航栏：在非桌面端或小窗口模式下显示
bottomNavigationBar:
(ServiceManager().uiState.isDesktop.value && !isSmallWindow)
? null
: BottomNav(
navigationItems: navigationItems,
colorScheme: colorScheme,
),
);
});
}
Expand Down
26 changes: 16 additions & 10 deletions lib/shared/widgets/common/network_topology.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,9 @@ class _NetworkTopologyViewState extends State<NetworkTopologyView> {
@override
void didUpdateWidget(NetworkTopologyView oldWidget) {
super.didUpdateWidget(oldWidget);
final resumedFromBackground = oldWidget.isInBackground && !widget.isInBackground;
_syncGraph(force: resumedFromBackground);
final backgroundStateChanged =
oldWidget.isInBackground != widget.isInBackground;
_syncGraph(force: backgroundStateChanged);
}

@override
Expand All @@ -58,20 +59,23 @@ class _NetworkTopologyViewState extends State<NetworkTopologyView> {
}

void _syncGraph({bool force = false}) {
if (!force && widget.isInBackground) {
return;
}
final now = DateTime.now();
final shouldAnimate = _shouldAnimateConnections;
final animationStateChanged =
_lastShouldAnimateConnections != shouldAnimate;

if (!force && widget.isInBackground && !animationStateChanged) return;

if (!force &&
widget.reduceUpdates &&
!animationStateChanged &&
_lastGraphSyncAt != null &&
DateTime.now().difference(_lastGraphSyncAt!) < _reducedSyncInterval) {
now.difference(_lastGraphSyncAt!) < _reducedSyncInterval) {
return;
}

final localIp = ServiceManager().networkConfigState.ipv4.value;
final graphSignature = _calculateGraphSignature(widget.nodes, localIp);
final shouldAnimate = _shouldAnimateConnections;
if (_controller != null &&
_lastGraphSignature == graphSignature &&
_lastShouldAnimateConnections == shouldAnimate) {
Expand Down Expand Up @@ -102,14 +106,14 @@ class _NetworkTopologyViewState extends State<NetworkTopologyView> {
);
_lastGraphSignature = graphSignature;
_lastShouldAnimateConnections = shouldAnimate;
_lastGraphSyncAt = DateTime.now();
_lastGraphSyncAt = now;
return;
}

_applyGraphDiff(model);
_lastGraphSignature = graphSignature;
_lastShouldAnimateConnections = shouldAnimate;
_lastGraphSyncAt = DateTime.now();
_lastGraphSyncAt = now;
}

int _calculateGraphSignature(List<KVNodeInfo> nodes, String localIp) {
Expand Down Expand Up @@ -419,7 +423,9 @@ class _NetworkTopologyViewState extends State<NetworkTopologyView> {
targetNodeId: hopId,
targetPortId: 'in',
animationEffect:
_shouldAnimateConnections ? ConnectionEffects.particles : null,
_shouldAnimateConnections
? ConnectionEffects.particles
: null,
label: ConnectionLabel(text: _formatLatencyLabel(hop.latencyMs)),
);
}
Expand Down
3 changes: 0 additions & 3 deletions lib/shared/widgets/common/windows_controls.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,11 +105,8 @@ class _WindowControlsState extends State<WindowControls>
IconButton(
icon: const Icon(Icons.remove),
onPressed: () async {

print('Minimize button was pressed!');
ServiceManager().uiState.setBackground(true);
await windowManager.minimize();

},
tooltip: '最小化',
iconSize: 20,
Expand Down
Loading