From f9f419f03f4ba868c30fd6053df21d4fbec05b82 Mon Sep 17 00:00:00 2001 From: lollipopkit Date: Thu, 23 Nov 2023 22:22:56 +0800 Subject: [PATCH] new: edit `docker host` on err --- ios/Runner.xcodeproj/project.pbxproj | 36 ++++++++++++++-------------- lib/data/res/build_data.dart | 8 +++---- lib/data/res/github_id.dart | 3 ++- lib/view/page/docker.dart | 7 ++++-- make.dart | 2 +- 5 files changed, 30 insertions(+), 26 deletions(-) diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index 7444d91e..41727cbf 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 = 646; + CURRENT_PROJECT_VERSION = 648; DEVELOPMENT_TEAM = BA88US33G6; ENABLE_BITCODE = NO; INFOPLIST_FILE = "Runner/Info-$(CONFIGURATION).plist"; @@ -596,7 +596,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.646; + MARKETING_VERSION = 1.0.648; 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 = 646; + CURRENT_PROJECT_VERSION = 648; DEVELOPMENT_TEAM = BA88US33G6; ENABLE_BITCODE = NO; INFOPLIST_FILE = "Runner/Info-$(CONFIGURATION).plist"; @@ -730,7 +730,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.646; + MARKETING_VERSION = 1.0.648; 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 = 646; + CURRENT_PROJECT_VERSION = 648; DEVELOPMENT_TEAM = BA88US33G6; ENABLE_BITCODE = NO; INFOPLIST_FILE = "Runner/Info-$(CONFIGURATION).plist"; @@ -758,7 +758,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.646; + MARKETING_VERSION = 1.0.648; 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 = 646; + CURRENT_PROJECT_VERSION = 648; 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.646; + MARKETING_VERSION = 1.0.648; 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 = 646; + CURRENT_PROJECT_VERSION = 648; 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.646; + MARKETING_VERSION = 1.0.648; 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 = 646; + CURRENT_PROJECT_VERSION = 648; 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.646; + MARKETING_VERSION = 1.0.648; 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 = 646; + CURRENT_PROJECT_VERSION = 648; DEVELOPMENT_ASSET_PATHS = ""; DEVELOPMENT_TEAM = BA88US33G6; ENABLE_PREVIEWS = YES; @@ -902,7 +902,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.646; + MARKETING_VERSION = 1.0.648; 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 = 646; + CURRENT_PROJECT_VERSION = 648; DEVELOPMENT_ASSET_PATHS = ""; DEVELOPMENT_TEAM = BA88US33G6; ENABLE_PREVIEWS = YES; @@ -943,7 +943,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.646; + MARKETING_VERSION = 1.0.648; 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 = 646; + CURRENT_PROJECT_VERSION = 648; DEVELOPMENT_ASSET_PATHS = ""; DEVELOPMENT_TEAM = BA88US33G6; ENABLE_PREVIEWS = YES; @@ -981,7 +981,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.646; + MARKETING_VERSION = 1.0.648; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox.WatchEnd; PRODUCT_NAME = ServerBox; diff --git a/lib/data/res/build_data.dart b/lib/data/res/build_data.dart index e187ceb0..c0a61a1e 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 = 646; + static const int build = 648; static const String engine = "3.16.0"; - static const String buildAt = "2023-11-23 00:07:00"; - static const int modifications = 7; - static const int script = 28; + static const String buildAt = "2023-11-23 22:02:19"; + static const int modifications = 4; + static const int script = 29; } diff --git a/lib/data/res/github_id.dart b/lib/data/res/github_id.dart index 06921a8a..d0d6cb12 100644 --- a/lib/data/res/github_id.dart +++ b/lib/data/res/github_id.dart @@ -40,6 +40,7 @@ class GithubIds { 'wcbing', 'balh55y', 'wc7086', - 'michaelsara' + 'michaelsara', + 'xingleiwu' }; } diff --git a/lib/view/page/docker.dart b/lib/view/page/docker.dart index 109d2018..7e274863 100644 --- a/lib/view/page/docker.dart +++ b/lib/view/page/docker.dart @@ -198,7 +198,8 @@ class _DockerManagePageState extends State { Padding( padding: const EdgeInsets.all(17), child: _buildSolution(Pros.docker.error!), - ) + ), + _buildEditHost(), ], ), ); @@ -475,7 +476,9 @@ class _DockerManagePageState extends State { Widget _buildEditHost() { final children = []; - if (Pros.docker.items!.isEmpty && Pros.docker.images!.isEmpty) { + final emptyImgs = Pros.docker.images?.isEmpty ?? false; + final emptyPs = Pros.docker.items?.isEmpty ?? false; + if (emptyPs && emptyImgs) { children.add(Padding( padding: const EdgeInsets.fromLTRB(17, 17, 17, 0), child: Text( diff --git a/make.dart b/make.dart index 6ffc59d9..75cc7530 100755 --- a/make.dart +++ b/make.dart @@ -77,7 +77,7 @@ Future> getBuildData() async { 'name': appName, 'build': build, 'engine': await getFlutterVersion(), - 'buildAt': DateTime.now().toString().split('.')[0], + 'buildAt': DateTime.now().toString().split('.').firstOrNull, 'modifications': await getGitModificationCount(), 'script': await getScriptCommitCount(), };