From 991d91b636e1d01e756e016282de2703b3315b7f Mon Sep 17 00:00:00 2001 From: lollipopkit Date: Tue, 9 Apr 2024 16:51:00 +0800 Subject: [PATCH] opt.: only calc `cpu0` --- ios/Runner.xcodeproj/project.pbxproj | 36 ++++++------- lib/data/model/server/cpu.dart | 72 +++++++++++++------------- lib/data/res/build_data.dart | 6 +-- lib/view/page/server/detail/misc.dart | 10 ++-- lib/view/page/server/detail/view.dart | 3 +- macos/Runner.xcodeproj/project.pbxproj | 12 ++--- 6 files changed, 68 insertions(+), 71 deletions(-) diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index cb3593b5..b1f114af 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -672,7 +672,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; - CURRENT_PROJECT_VERSION = 843; + CURRENT_PROJECT_VERSION = 844; DEVELOPMENT_TEAM = BA88US33G6; ENABLE_BITCODE = NO; INFOPLIST_FILE = "Runner/Info-$(CONFIGURATION).plist"; @@ -682,7 +682,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.843; + MARKETING_VERSION = 1.0.844; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; @@ -808,7 +808,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; - CURRENT_PROJECT_VERSION = 843; + CURRENT_PROJECT_VERSION = 844; DEVELOPMENT_TEAM = BA88US33G6; ENABLE_BITCODE = NO; INFOPLIST_FILE = "Runner/Info-$(CONFIGURATION).plist"; @@ -818,7 +818,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.843; + MARKETING_VERSION = 1.0.844; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; @@ -836,7 +836,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; - CURRENT_PROJECT_VERSION = 843; + CURRENT_PROJECT_VERSION = 844; DEVELOPMENT_TEAM = BA88US33G6; ENABLE_BITCODE = NO; INFOPLIST_FILE = "Runner/Info-$(CONFIGURATION).plist"; @@ -846,7 +846,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.843; + MARKETING_VERSION = 1.0.844; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; @@ -867,7 +867,7 @@ CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 843; + CURRENT_PROJECT_VERSION = 844; DEVELOPMENT_TEAM = BA88US33G6; GCC_C_LANGUAGE_STANDARD = gnu11; GENERATE_INFOPLIST_FILE = YES; @@ -880,7 +880,7 @@ "@executable_path/Frameworks", "@executable_path/../../Frameworks", ); - MARKETING_VERSION = 1.0.843; + MARKETING_VERSION = 1.0.844; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox.StatusWidget; @@ -906,7 +906,7 @@ CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 843; + CURRENT_PROJECT_VERSION = 844; DEVELOPMENT_TEAM = BA88US33G6; GCC_C_LANGUAGE_STANDARD = gnu11; GENERATE_INFOPLIST_FILE = YES; @@ -919,7 +919,7 @@ "@executable_path/Frameworks", "@executable_path/../../Frameworks", ); - MARKETING_VERSION = 1.0.843; + MARKETING_VERSION = 1.0.844; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox.StatusWidget; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -942,7 +942,7 @@ CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 843; + CURRENT_PROJECT_VERSION = 844; DEVELOPMENT_TEAM = BA88US33G6; GCC_C_LANGUAGE_STANDARD = gnu11; GENERATE_INFOPLIST_FILE = YES; @@ -955,7 +955,7 @@ "@executable_path/Frameworks", "@executable_path/../../Frameworks", ); - MARKETING_VERSION = 1.0.843; + MARKETING_VERSION = 1.0.844; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox.StatusWidget; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -978,7 +978,7 @@ CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 843; + CURRENT_PROJECT_VERSION = 844; DEVELOPMENT_ASSET_PATHS = ""; DEVELOPMENT_TEAM = BA88US33G6; ENABLE_PREVIEWS = YES; @@ -990,7 +990,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.843; + MARKETING_VERSION = 1.0.844; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox.WatchEnd; @@ -1019,7 +1019,7 @@ CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 843; + CURRENT_PROJECT_VERSION = 844; DEVELOPMENT_ASSET_PATHS = ""; DEVELOPMENT_TEAM = BA88US33G6; ENABLE_PREVIEWS = YES; @@ -1031,7 +1031,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.843; + MARKETING_VERSION = 1.0.844; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox.WatchEnd; PRODUCT_NAME = ServerBox; @@ -1057,7 +1057,7 @@ CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 843; + CURRENT_PROJECT_VERSION = 844; DEVELOPMENT_ASSET_PATHS = ""; DEVELOPMENT_TEAM = BA88US33G6; ENABLE_PREVIEWS = YES; @@ -1069,7 +1069,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.843; + MARKETING_VERSION = 1.0.844; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox.WatchEnd; PRODUCT_NAME = ServerBox; diff --git a/lib/data/model/server/cpu.dart b/lib/data/model/server/cpu.dart index 33b9f3b1..24b9636e 100644 --- a/lib/data/model/server/cpu.dart +++ b/lib/data/model/server/cpu.dart @@ -1,7 +1,6 @@ import 'dart:collection'; import 'package:fl_chart/fl_chart.dart'; -import 'package:toolbox/data/model/app/range.dart'; import 'package:toolbox/data/model/server/time_seq.dart'; import 'package:toolbox/data/res/status.dart'; @@ -19,7 +18,7 @@ class Cpus extends TimeSeq> { _iowait = _getIowait(); _idle = _getIdle(); _updateSpots(); - _updateRange(); + //_updateRange(); } double usedPercent({int coreIdx = 0}) { @@ -68,12 +67,15 @@ class Cpus extends TimeSeq> { double _getIdle() => 100 - usedPercent(); void _coresLoop(void Function(int i) callback) { - /// Only update the entire core when [coresCount] > 4, or the chart will be too crowded - final onlyCalcSingle = coresCount > 4; - final maxIdx = onlyCalcSingle ? 1 : coresCount; - for (var i = onlyCalcSingle ? 0 : 1; i < maxIdx; i++) { - callback(i); - } + /// Only update the entire cpu when [coresCount] > 4, or the chart will be too crowded + // final onlyCalcSingle = coresCount > 4; + // final maxIdx = onlyCalcSingle ? 1 : coresCount; + // for (var i = onlyCalcSingle ? 0 : 1; i < maxIdx; i++) { + // callback(i); + // } + + /// Only use cpu0 + callback(0); } /// [core1, core2] @@ -92,34 +94,34 @@ class Cpus extends TimeSeq> { }); } - var _rangeX = Range(0.0, _kCap.toDouble()); - Range get rangeX => _rangeX; - // var _rangeY = Range(0.0, 100.0); - // Range get rangeY => _rangeY; - void _updateRange() { - double minX = 0; - double maxX = 0; - _coresLoop((i) { - final fifo = _spots[i]; - if (fifo.isEmpty) return; - final first = fifo.first.x; - final last = fifo.last.x; - if (first > minX) minX = first; - if (last > maxX) maxX = last; - }); - _rangeX = Range(minX, maxX); + // var _rangeX = Range(0.0, _kCap.toDouble()); + // Range get rangeX => _rangeX; + // // var _rangeY = Range(0.0, 100.0); + // // Range get rangeY => _rangeY; + // void _updateRange() { + // double minX = 0; + // double maxX = 0; + // _coresLoop((i) { + // final fifo = _spots[i]; + // if (fifo.isEmpty) return; + // final first = fifo.first.x; + // final last = fifo.last.x; + // if (first > minX) minX = first; + // if (last > maxX) maxX = last; + // }); + // _rangeX = Range(minX, maxX); - // double? minY, maxY; - // for (var i = 1; i < now.length; i++) { - // final item = _spots[i]; - // if (item.isEmpty) continue; - // final first = item.first.y; - // final last = item.last.y; - // if (minY == null || first < minY) minY = first; - // if (maxY == null || last > maxY) maxY = last; - // } - // if (minY != null && maxY != null) _rangeY = Range(minY, maxY); - } + // // double? minY, maxY; + // // for (var i = 1; i < now.length; i++) { + // // final item = _spots[i]; + // // if (item.isEmpty) continue; + // // final first = item.first.y; + // // final last = item.last.y; + // // if (minY == null || first < minY) minY = first; + // // if (maxY == null || last > maxY) maxY = last; + // // } + // // if (minY != null && maxY != null) _rangeY = Range(minY, maxY); + // } } class SingleCpuCore extends TimeSeqIface { diff --git a/lib/data/res/build_data.dart b/lib/data/res/build_data.dart index 9642b31f..23495b9e 100644 --- a/lib/data/res/build_data.dart +++ b/lib/data/res/build_data.dart @@ -2,9 +2,9 @@ class BuildData { static const String name = "ServerBox"; - static const int build = 843; + static const int build = 844; static const String engine = "3.19.5"; - static const String buildAt = "2024-04-08 23:44:39"; - static const int modifications = 4; + static const String buildAt = "2024-04-09 11:19:03"; + static const int modifications = 2; static const int script = 44; } diff --git a/lib/view/page/server/detail/misc.dart b/lib/view/page/server/detail/misc.dart index f00487a1..d138e719 100644 --- a/lib/view/page/server/detail/misc.dart +++ b/lib/view/page/server/detail/misc.dart @@ -38,8 +38,7 @@ enum _NetSortType { } Widget _buildLineChart( - List> spots, - Range x, { + List> spots, { String? tooltipPrefix, bool curve = false, int verticalInterval = 20, @@ -69,9 +68,8 @@ Widget _buildLineChart( horizontalInterval: verticalInterval.toDouble(), getDrawingHorizontalLine: (value) { return const FlLine( - color: Color(0xff37434d), + color: Color.fromARGB(43, 88, 91, 94), strokeWidth: 1, - dashArray: [5, 17], ); }, ), @@ -89,7 +87,7 @@ Widget _buildLineChart( leftTitles: AxisTitles( sideTitles: SideTitles( showTitles: true, - interval: 1, + interval: 20, getTitlesWidget: (val, meta) { if (val % verticalInterval != 0) return UIs.placeholder; if (val == 0) return const Text('0 %', style: UIs.text12Grey); @@ -103,8 +101,6 @@ Widget _buildLineChart( ), ), borderData: FlBorderData(show: false), - minX: x.start, - maxX: x.end, minY: -1, maxY: 101, lineBarsData: spots diff --git a/lib/view/page/server/detail/view.dart b/lib/view/page/server/detail/view.dart index d48f740b..a8da634e 100644 --- a/lib/view/page/server/detail/view.dart +++ b/lib/view/page/server/detail/view.dart @@ -5,7 +5,6 @@ import 'package:provider/provider.dart'; import 'package:toolbox/core/extension/context/common.dart'; import 'package:toolbox/core/extension/context/dialog.dart'; import 'package:toolbox/core/extension/context/locale.dart'; -import 'package:toolbox/data/model/app/range.dart'; import 'package:toolbox/data/model/app/server_detail_card.dart'; import 'package:toolbox/data/model/app/shell_func.dart'; import 'package:toolbox/data/model/server/battery.dart'; @@ -199,7 +198,7 @@ class _ServerDetailPageState extends State width: _media.size.width - 26 - 34, child: _buildLineChart( ss.cpu.spots, - ss.cpu.rangeX, + //ss.cpu.rangeX, tooltipPrefix: 'CPU', ), ), diff --git a/macos/Runner.xcodeproj/project.pbxproj b/macos/Runner.xcodeproj/project.pbxproj index aec814f8..596bc631 100644 --- a/macos/Runner.xcodeproj/project.pbxproj +++ b/macos/Runner.xcodeproj/project.pbxproj @@ -471,7 +471,7 @@ CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 843; + CURRENT_PROJECT_VERSION = 844; DEVELOPMENT_TEAM = BA88US33G6; INFOPLIST_FILE = Runner/Info.plist; INFOPLIST_KEY_CFBundleDisplayName = "Server Box"; @@ -481,7 +481,7 @@ "@executable_path/../Frameworks", ); MACOSX_DEPLOYMENT_TARGET = 10.15; - MARKETING_VERSION = 1.0.843; + MARKETING_VERSION = 1.0.844; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox; PRODUCT_NAME = "Server Box"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -608,7 +608,7 @@ CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 843; + CURRENT_PROJECT_VERSION = 844; DEVELOPMENT_TEAM = BA88US33G6; INFOPLIST_FILE = Runner/Info.plist; INFOPLIST_KEY_CFBundleDisplayName = "Server Box"; @@ -618,7 +618,7 @@ "@executable_path/../Frameworks", ); MACOSX_DEPLOYMENT_TARGET = 10.15; - MARKETING_VERSION = 1.0.843; + MARKETING_VERSION = 1.0.844; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox; PRODUCT_NAME = "Server Box"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -638,7 +638,7 @@ "CODE_SIGN_IDENTITY[sdk=macosx*]" = "3rd Party Mac Developer Application"; CODE_SIGN_STYLE = Manual; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 843; + CURRENT_PROJECT_VERSION = 844; DEVELOPMENT_TEAM = ""; "DEVELOPMENT_TEAM[sdk=macosx*]" = BA88US33G6; INFOPLIST_FILE = Runner/Info.plist; @@ -649,7 +649,7 @@ "@executable_path/../Frameworks", ); MACOSX_DEPLOYMENT_TARGET = 10.15; - MARKETING_VERSION = 1.0.843; + MARKETING_VERSION = 1.0.844; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox; PRODUCT_NAME = "Server Box"; PROVISIONING_PROFILE_SPECIFIER = "";