diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index 2f00eb78..efef3e34 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -586,7 +586,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; - CURRENT_PROJECT_VERSION = 622; + CURRENT_PROJECT_VERSION = 627; DEVELOPMENT_TEAM = BA88US33G6; ENABLE_BITCODE = NO; INFOPLIST_FILE = "Runner/Info-$(CONFIGURATION).plist"; @@ -596,7 +596,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.622; + MARKETING_VERSION = 1.0.627; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; @@ -720,7 +720,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; - CURRENT_PROJECT_VERSION = 622; + CURRENT_PROJECT_VERSION = 627; DEVELOPMENT_TEAM = BA88US33G6; ENABLE_BITCODE = NO; INFOPLIST_FILE = "Runner/Info-$(CONFIGURATION).plist"; @@ -730,7 +730,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.622; + MARKETING_VERSION = 1.0.627; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; @@ -748,7 +748,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; - CURRENT_PROJECT_VERSION = 622; + CURRENT_PROJECT_VERSION = 627; DEVELOPMENT_TEAM = BA88US33G6; ENABLE_BITCODE = NO; INFOPLIST_FILE = "Runner/Info-$(CONFIGURATION).plist"; @@ -758,7 +758,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.622; + MARKETING_VERSION = 1.0.627; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; @@ -779,7 +779,7 @@ CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 622; + CURRENT_PROJECT_VERSION = 627; DEVELOPMENT_TEAM = BA88US33G6; GCC_C_LANGUAGE_STANDARD = gnu11; GENERATE_INFOPLIST_FILE = YES; @@ -792,7 +792,7 @@ "@executable_path/Frameworks", "@executable_path/../../Frameworks", ); - MARKETING_VERSION = 1.0.622; + MARKETING_VERSION = 1.0.627; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox.StatusWidget; @@ -818,7 +818,7 @@ CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 622; + CURRENT_PROJECT_VERSION = 627; DEVELOPMENT_TEAM = BA88US33G6; GCC_C_LANGUAGE_STANDARD = gnu11; GENERATE_INFOPLIST_FILE = YES; @@ -831,7 +831,7 @@ "@executable_path/Frameworks", "@executable_path/../../Frameworks", ); - MARKETING_VERSION = 1.0.622; + MARKETING_VERSION = 1.0.627; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox.StatusWidget; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -854,7 +854,7 @@ CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 622; + CURRENT_PROJECT_VERSION = 627; DEVELOPMENT_TEAM = BA88US33G6; GCC_C_LANGUAGE_STANDARD = gnu11; GENERATE_INFOPLIST_FILE = YES; @@ -867,7 +867,7 @@ "@executable_path/Frameworks", "@executable_path/../../Frameworks", ); - MARKETING_VERSION = 1.0.622; + MARKETING_VERSION = 1.0.627; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox.StatusWidget; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -890,7 +890,7 @@ CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 622; + CURRENT_PROJECT_VERSION = 627; DEVELOPMENT_ASSET_PATHS = ""; DEVELOPMENT_TEAM = BA88US33G6; ENABLE_PREVIEWS = YES; @@ -902,7 +902,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.622; + MARKETING_VERSION = 1.0.627; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox.WatchEnd; @@ -931,7 +931,7 @@ CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 622; + CURRENT_PROJECT_VERSION = 627; DEVELOPMENT_ASSET_PATHS = ""; DEVELOPMENT_TEAM = BA88US33G6; ENABLE_PREVIEWS = YES; @@ -943,7 +943,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.622; + MARKETING_VERSION = 1.0.627; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox.WatchEnd; PRODUCT_NAME = ServerBox; @@ -969,7 +969,7 @@ CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 622; + CURRENT_PROJECT_VERSION = 627; DEVELOPMENT_ASSET_PATHS = ""; DEVELOPMENT_TEAM = BA88US33G6; ENABLE_PREVIEWS = YES; @@ -981,7 +981,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.622; + MARKETING_VERSION = 1.0.627; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox.WatchEnd; PRODUCT_NAME = ServerBox; diff --git a/lib/data/model/app/net_view.dart b/lib/data/model/app/net_view.dart index 3c2e9b3a..86077848 100644 --- a/lib/data/model/app/net_view.dart +++ b/lib/data/model/app/net_view.dart @@ -1,6 +1,6 @@ import 'package:hive_flutter/hive_flutter.dart'; import 'package:toolbox/core/extension/context/locale.dart'; -import 'package:toolbox/data/model/server/server_status.dart'; +import 'package:toolbox/data/model/server/server.dart'; part 'net_view.g.dart'; diff --git a/lib/data/model/server/server.dart b/lib/data/model/server/server.dart index b2437a88..406e9bdb 100644 --- a/lib/data/model/server/server.dart +++ b/lib/data/model/server/server.dart @@ -1,6 +1,12 @@ import 'package:dartssh2/dartssh2.dart'; +import 'package:toolbox/data/model/server/conn.dart'; +import 'package:toolbox/data/model/server/cpu.dart'; +import 'package:toolbox/data/model/server/disk.dart'; +import 'package:toolbox/data/model/server/memory.dart'; +import 'package:toolbox/data/model/server/net_speed.dart'; import 'package:toolbox/data/model/server/server_private_info.dart'; -import 'package:toolbox/data/model/server/server_status.dart'; +import 'package:toolbox/data/model/server/system.dart'; +import 'package:toolbox/data/model/server/temp.dart'; import '../app/tag_pickable.dart'; @@ -10,9 +16,6 @@ class Server implements TagPickable { SSHClient? client; ServerState state; - /// Whether is connectting, parsing and etc. - bool isBusy = false; - Server(this.spi, this.status, this.client, this.state); @override @@ -28,6 +31,43 @@ class Server implements TagPickable { bool get canViewDetails => state == ServerState.finished; String get id => spi.id; + + bool get isBusy => status._isBusy; + + set isBusy(bool value) => status._isBusy = value; +} + +class ServerStatus { + Cpus cpu; + Memory mem; + Swap swap; + String sysVer; + String uptime; + List disk; + Conn tcp; + NetSpeed netSpeed; + Temperatures temps; + SystemType system; + String? failedInfo; + DiskIO diskIO; + + /// Whether is connectting, parsing and etc. + bool _isBusy = false; + + ServerStatus({ + required this.cpu, + required this.mem, + required this.sysVer, + required this.uptime, + required this.disk, + required this.tcp, + required this.netSpeed, + required this.swap, + required this.temps, + required this.system, + required this.diskIO, + this.failedInfo, + }); } enum ServerState { diff --git a/lib/data/model/server/server_status.dart b/lib/data/model/server/server_status.dart deleted file mode 100644 index a4223d8f..00000000 --- a/lib/data/model/server/server_status.dart +++ /dev/null @@ -1,38 +0,0 @@ -import 'package:toolbox/data/model/server/system.dart'; -import 'package:toolbox/data/model/server/temp.dart'; - -import 'cpu.dart'; -import 'disk.dart'; -import 'memory.dart'; -import 'net_speed.dart'; -import 'conn.dart'; - -class ServerStatus { - Cpus cpu; - Memory mem; - Swap swap; - String sysVer; - String uptime; - List disk; - Conn tcp; - NetSpeed netSpeed; - Temperatures temps; - SystemType system; - String? failedInfo; - DiskIO diskIO; - - ServerStatus({ - required this.cpu, - required this.mem, - required this.sysVer, - required this.uptime, - required this.disk, - required this.tcp, - required this.netSpeed, - required this.swap, - required this.temps, - required this.system, - required this.diskIO, - this.failedInfo, - }); -} diff --git a/lib/data/model/server/server_status_update_req.dart b/lib/data/model/server/server_status_update_req.dart index bbf6d6c0..59953108 100644 --- a/lib/data/model/server/server_status_update_req.dart +++ b/lib/data/model/server/server_status_update_req.dart @@ -1,3 +1,4 @@ +import 'package:toolbox/data/model/server/server.dart'; import 'package:toolbox/data/model/server/system.dart'; import 'package:toolbox/data/res/logger.dart'; @@ -6,7 +7,6 @@ import 'cpu.dart'; import 'disk.dart'; import 'memory.dart'; import 'net_speed.dart'; -import 'server_status.dart'; import 'conn.dart'; class ServerStatusUpdateReq { diff --git a/lib/data/res/build_data.dart b/lib/data/res/build_data.dart index ae74c2d7..652d90fc 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 = 622; + static const int build = 627; static const String engine = "3.13.8"; - static const String buildAt = "2023-10-31 20:16:41"; - static const int modifications = 2; + static const String buildAt = "2023-11-01 20:01:37"; + static const int modifications = 14; static const int script = 25; } diff --git a/lib/data/res/status.dart b/lib/data/res/status.dart index 22178195..df15f96f 100644 --- a/lib/data/res/status.dart +++ b/lib/data/res/status.dart @@ -1,10 +1,10 @@ +import 'package:toolbox/data/model/server/server.dart'; import 'package:toolbox/data/model/server/temp.dart'; import '../model/server/cpu.dart'; import '../model/server/disk.dart'; import '../model/server/memory.dart'; import '../model/server/net_speed.dart'; -import '../model/server/server_status.dart'; import '../model/server/conn.dart'; import '../model/server/system.dart'; diff --git a/lib/view/page/full_screen.dart b/lib/view/page/full_screen.dart index 7777de75..97308a37 100644 --- a/lib/view/page/full_screen.dart +++ b/lib/view/page/full_screen.dart @@ -20,7 +20,6 @@ import '../../core/utils/ui.dart'; import '../../data/model/app/net_view.dart'; import '../../data/model/server/server.dart'; import '../../data/model/server/server_private_info.dart'; -import '../../data/model/server/server_status.dart'; import '../../data/res/color.dart'; class FullScreenPage extends StatefulWidget { diff --git a/lib/view/page/server/detail.dart b/lib/view/page/server/detail.dart index b6b3e833..9f5ca9a0 100644 --- a/lib/view/page/server/detail.dart +++ b/lib/view/page/server/detail.dart @@ -15,7 +15,6 @@ import 'package:toolbox/view/widget/server_func_btns.dart'; import '../../../core/extension/numx.dart'; import '../../../core/route.dart'; import '../../../data/model/server/server.dart'; -import '../../../data/model/server/server_status.dart'; import '../../../data/provider/server.dart'; import '../../../data/res/color.dart'; import '../../../data/res/default.dart'; diff --git a/lib/view/page/server/tab.dart b/lib/view/page/server/tab.dart index 91079bfe..2386914d 100644 --- a/lib/view/page/server/tab.dart +++ b/lib/view/page/server/tab.dart @@ -19,7 +19,6 @@ import '../../../data/model/app/net_view.dart'; import '../../../data/model/server/disk.dart'; import '../../../data/model/server/server.dart'; import '../../../data/model/server/server_private_info.dart'; -import '../../../data/model/server/server_status.dart'; import '../../../data/provider/server.dart'; import '../../../data/res/color.dart'; import '../../../data/res/ui.dart'; diff --git a/lib/view/widget/server_func_btns.dart b/lib/view/widget/server_func_btns.dart index 25733d0a..1766bbcf 100644 --- a/lib/view/widget/server_func_btns.dart +++ b/lib/view/widget/server_func_btns.dart @@ -103,7 +103,9 @@ class ServerFuncBtns extends StatelessWidget { ? Column( children: [ Icon(e.icon, size: iconSize ?? 15), - Text(e.toStr, style: const TextStyle(fontSize: 7, color: Colors.grey)) + Text(e.toStr, + style: const TextStyle( + fontSize: 7, color: Colors.grey)) ], ) : Icon(e.icon, size: iconSize ?? 15),