diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index 1bef3b79..00d3f767 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -360,7 +360,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; - CURRENT_PROJECT_VERSION = 363; + CURRENT_PROJECT_VERSION = 365; DEVELOPMENT_TEAM = BA88US33G6; ENABLE_BITCODE = NO; INFOPLIST_FILE = "Runner/Info-$(CONFIGURATION).plist"; @@ -368,7 +368,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.363; + MARKETING_VERSION = 1.0.365; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; @@ -491,7 +491,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; - CURRENT_PROJECT_VERSION = 363; + CURRENT_PROJECT_VERSION = 365; DEVELOPMENT_TEAM = BA88US33G6; ENABLE_BITCODE = NO; INFOPLIST_FILE = "Runner/Info-$(CONFIGURATION).plist"; @@ -499,7 +499,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.363; + MARKETING_VERSION = 1.0.365; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; @@ -516,7 +516,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; - CURRENT_PROJECT_VERSION = 363; + CURRENT_PROJECT_VERSION = 365; DEVELOPMENT_TEAM = BA88US33G6; ENABLE_BITCODE = NO; INFOPLIST_FILE = "Runner/Info-$(CONFIGURATION).plist"; @@ -524,7 +524,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.363; + MARKETING_VERSION = 1.0.365; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; diff --git a/lib/core/persistant_store.dart b/lib/core/persistant_store.dart index 95b91f04..80efc489 100644 --- a/lib/core/persistant_store.dart +++ b/lib/core/persistant_store.dart @@ -31,6 +31,10 @@ class StoreProperty { return _box.get(_key, defaultValue: defaultValue); } + dynamic fetchRaw() { + return _box.get(_key, defaultValue: defaultValue); + } + Future put(T value) { return _box.put(_key, value); } diff --git a/lib/data/res/build_data.dart b/lib/data/res/build_data.dart index ff8453dd..958e29cc 100644 --- a/lib/data/res/build_data.dart +++ b/lib/data/res/build_data.dart @@ -2,8 +2,8 @@ class BuildData { static const String name = "ServerBox"; - static const int build = 363; - static const String engine = "3.10.0"; - static const String buildAt = "2023-06-23 17:27:11.745150"; - static const int modifications = 5; + static const int build = 365; + static const String engine = "3.10.3"; + static const String buildAt = "2023-06-27 00:42:16.407149"; + static const int modifications = 3; } diff --git a/lib/data/res/misc.dart b/lib/data/res/misc.dart index 2e6ec310..9851ee8c 100644 --- a/lib/data/res/misc.dart +++ b/lib/data/res/misc.dart @@ -10,7 +10,7 @@ const privateKeyMaxSize = 20 * 1024; const editorMaxSize = 1024 * 1024; /// Max debug log lines -const maxDebugLogLines = 100; +const maxDebugLogLines = 377; /// Method Channels const pkgName = 'tech.lolli.toolbox'; diff --git a/lib/data/res/url.dart b/lib/data/res/url.dart index bb09ef16..0874c111 100644 --- a/lib/data/res/url.dart +++ b/lib/data/res/url.dart @@ -13,4 +13,5 @@ const thanksMap = { 'QingAnLe': 'https://github.com/QingAnLe', 'wxdjs': 'https://github.com/wxdjs', 'Aeorq': 'https://github.com/Aeorq', + 'jaychoubaby': 'https://github.com/jaychoubaby', }; diff --git a/lib/main.dart b/lib/main.dart index 9eb24266..9c1463b3 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -47,10 +47,11 @@ Future initApp() async { Future initHive() async { await Hive.initFlutter(); - Hive.registerAdapter(SnippetAdapter()); - Hive.registerAdapter(VirtKeyAdapter()); + // 以 typeId 为顺序 Hive.registerAdapter(PrivateKeyInfoAdapter()); + Hive.registerAdapter(SnippetAdapter()); Hive.registerAdapter(ServerPrivateInfoAdapter()); + Hive.registerAdapter(VirtKeyAdapter()); } void runInZone(dynamic Function() body) { diff --git a/lib/view/page/process.dart b/lib/view/page/process.dart index 4bb51d8e..06ea24bf 100644 --- a/lib/view/page/process.dart +++ b/lib/view/page/process.dart @@ -28,7 +28,7 @@ class _ProcessPageState extends State { PsResult _result = PsResult(procs: []); int? _lastFocusId; - ProcSortMode _procSortMode = ProcSortMode.cpu; + ProcSortMode _procSortMode = ProcSortMode.mem; final _serverProvider = locator(); @@ -121,10 +121,10 @@ class _ProcessPageState extends State { return RoundRectCard(ListTile( leading: SizedBox( width: 57, - child: TwoLineText(up: proc.pid.toString(), down: 'pid'), + child: TwoLineText(up: proc.pid.toString(), down: proc.user), ), title: Text(proc.binary), - subtitle: Text(proc.command, style: grey), + subtitle: Text(proc.command, style: grey, maxLines: 3, overflow: TextOverflow.fade,), trailing: Row( mainAxisSize: MainAxisSize.min, children: [ diff --git a/lib/view/page/ssh/term.dart b/lib/view/page/ssh/term.dart index a37ed445..df8f451a 100644 --- a/lib/view/page/ssh/term.dart +++ b/lib/view/page/ssh/term.dart @@ -80,7 +80,7 @@ class _SSHPageState extends State { _terminalTheme = _isDark ? termDarkTheme : termLightTheme; // Calculate virtkey width / height _virtKeyWidth = _media.size.width / 7; - _virtKeysHeight = _media.size.height * 0.047 * _virtKeysList.length; + _virtKeysHeight = _media.size.height * 0.043 * _virtKeysList.length; } @override diff --git a/lib/view/page/ssh/virt_key_setting.dart b/lib/view/page/ssh/virt_key_setting.dart index 033fa90d..5adb26ac 100644 --- a/lib/view/page/ssh/virt_key_setting.dart +++ b/lib/view/page/ssh/virt_key_setting.dart @@ -34,7 +34,11 @@ class _SSHVirtKeySettingPageState extends State { } Widget _buildBody() { - final keys = List.from(_setting.sshVirtKeys.fetch()!); + final keys_ = _setting.sshVirtKeys.fetchRaw()!; + final keys = []; + for (final key in keys_) { + keys.add(key); + } final disabled = VirtKey.values.where((e) => !keys.contains(e)).toList(); final allKeys = [...keys, ...disabled]; return ReorderableListView.builder( @@ -55,9 +59,7 @@ class _SSHVirtKeySettingPageState extends State { return; } keys.moveById(keys[o], keys[n], _setting.sshVirtKeys); - setState(() { - - }); + setState(() {}); }, ); } diff --git a/macos/Runner.xcodeproj/project.pbxproj b/macos/Runner.xcodeproj/project.pbxproj index 0eef26f8..abbb2b4a 100644 --- a/macos/Runner.xcodeproj/project.pbxproj +++ b/macos/Runner.xcodeproj/project.pbxproj @@ -475,9 +475,9 @@ baseConfigurationReference = C1C758C41C4E208965A68933 /* Pods-RunnerTests.debug.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; - CURRENT_PROJECT_VERSION = 363; + CURRENT_PROJECT_VERSION = 365; GENERATE_INFOPLIST_FILE = YES; - MARKETING_VERSION = 1.0.363; + MARKETING_VERSION = 1.0.365; PRODUCT_BUNDLE_IDENTIFIER = tech.lolli.serverBox.RunnerTests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; @@ -490,9 +490,9 @@ baseConfigurationReference = 15AF97DF993E8968098D6EBE /* Pods-RunnerTests.release.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; - CURRENT_PROJECT_VERSION = 363; + CURRENT_PROJECT_VERSION = 365; GENERATE_INFOPLIST_FILE = YES; - MARKETING_VERSION = 1.0.363; + MARKETING_VERSION = 1.0.365; PRODUCT_BUNDLE_IDENTIFIER = tech.lolli.serverBox.RunnerTests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; @@ -505,9 +505,9 @@ baseConfigurationReference = 7CFA7DE7FABA75685DFB6948 /* Pods-RunnerTests.profile.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; - CURRENT_PROJECT_VERSION = 363; + CURRENT_PROJECT_VERSION = 365; GENERATE_INFOPLIST_FILE = YES; - MARKETING_VERSION = 1.0.363; + MARKETING_VERSION = 1.0.365; PRODUCT_BUNDLE_IDENTIFIER = tech.lolli.serverBox.RunnerTests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0;