#64 opt. for process page

This commit is contained in:
lollipopkit
2023-06-27 12:27:16 +08:00
parent 0022294ea4
commit 9ffe5583fd
10 changed files with 35 additions and 27 deletions

View File

@@ -360,7 +360,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CURRENT_PROJECT_VERSION = 363; CURRENT_PROJECT_VERSION = 365;
DEVELOPMENT_TEAM = BA88US33G6; DEVELOPMENT_TEAM = BA88US33G6;
ENABLE_BITCODE = NO; ENABLE_BITCODE = NO;
INFOPLIST_FILE = "Runner/Info-$(CONFIGURATION).plist"; INFOPLIST_FILE = "Runner/Info-$(CONFIGURATION).plist";
@@ -368,7 +368,7 @@
"$(inherited)", "$(inherited)",
"@executable_path/Frameworks", "@executable_path/Frameworks",
); );
MARKETING_VERSION = 1.0.363; MARKETING_VERSION = 1.0.365;
PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
@@ -491,7 +491,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CURRENT_PROJECT_VERSION = 363; CURRENT_PROJECT_VERSION = 365;
DEVELOPMENT_TEAM = BA88US33G6; DEVELOPMENT_TEAM = BA88US33G6;
ENABLE_BITCODE = NO; ENABLE_BITCODE = NO;
INFOPLIST_FILE = "Runner/Info-$(CONFIGURATION).plist"; INFOPLIST_FILE = "Runner/Info-$(CONFIGURATION).plist";
@@ -499,7 +499,7 @@
"$(inherited)", "$(inherited)",
"@executable_path/Frameworks", "@executable_path/Frameworks",
); );
MARKETING_VERSION = 1.0.363; MARKETING_VERSION = 1.0.365;
PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
@@ -516,7 +516,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CURRENT_PROJECT_VERSION = 363; CURRENT_PROJECT_VERSION = 365;
DEVELOPMENT_TEAM = BA88US33G6; DEVELOPMENT_TEAM = BA88US33G6;
ENABLE_BITCODE = NO; ENABLE_BITCODE = NO;
INFOPLIST_FILE = "Runner/Info-$(CONFIGURATION).plist"; INFOPLIST_FILE = "Runner/Info-$(CONFIGURATION).plist";
@@ -524,7 +524,7 @@
"$(inherited)", "$(inherited)",
"@executable_path/Frameworks", "@executable_path/Frameworks",
); );
MARKETING_VERSION = 1.0.363; MARKETING_VERSION = 1.0.365;
PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";

View File

@@ -31,6 +31,10 @@ class StoreProperty<T> {
return _box.get(_key, defaultValue: defaultValue); return _box.get(_key, defaultValue: defaultValue);
} }
dynamic fetchRaw() {
return _box.get(_key, defaultValue: defaultValue);
}
Future<void> put(T value) { Future<void> put(T value) {
return _box.put(_key, value); return _box.put(_key, value);
} }

View File

@@ -2,8 +2,8 @@
class BuildData { class BuildData {
static const String name = "ServerBox"; static const String name = "ServerBox";
static const int build = 363; static const int build = 365;
static const String engine = "3.10.0"; static const String engine = "3.10.3";
static const String buildAt = "2023-06-23 17:27:11.745150"; static const String buildAt = "2023-06-27 00:42:16.407149";
static const int modifications = 5; static const int modifications = 3;
} }

View File

@@ -10,7 +10,7 @@ const privateKeyMaxSize = 20 * 1024;
const editorMaxSize = 1024 * 1024; const editorMaxSize = 1024 * 1024;
/// Max debug log lines /// Max debug log lines
const maxDebugLogLines = 100; const maxDebugLogLines = 377;
/// Method Channels /// Method Channels
const pkgName = 'tech.lolli.toolbox'; const pkgName = 'tech.lolli.toolbox';

View File

@@ -13,4 +13,5 @@ const thanksMap = {
'QingAnLe': 'https://github.com/QingAnLe', 'QingAnLe': 'https://github.com/QingAnLe',
'wxdjs': 'https://github.com/wxdjs', 'wxdjs': 'https://github.com/wxdjs',
'Aeorq': 'https://github.com/Aeorq', 'Aeorq': 'https://github.com/Aeorq',
'jaychoubaby': 'https://github.com/jaychoubaby',
}; };

View File

@@ -47,10 +47,11 @@ Future<void> initApp() async {
Future<void> initHive() async { Future<void> initHive() async {
await Hive.initFlutter(); await Hive.initFlutter();
Hive.registerAdapter(SnippetAdapter()); // 以 typeId 为顺序
Hive.registerAdapter(VirtKeyAdapter());
Hive.registerAdapter(PrivateKeyInfoAdapter()); Hive.registerAdapter(PrivateKeyInfoAdapter());
Hive.registerAdapter(SnippetAdapter());
Hive.registerAdapter(ServerPrivateInfoAdapter()); Hive.registerAdapter(ServerPrivateInfoAdapter());
Hive.registerAdapter(VirtKeyAdapter());
} }
void runInZone(dynamic Function() body) { void runInZone(dynamic Function() body) {

View File

@@ -28,7 +28,7 @@ class _ProcessPageState extends State<ProcessPage> {
PsResult _result = PsResult(procs: []); PsResult _result = PsResult(procs: []);
int? _lastFocusId; int? _lastFocusId;
ProcSortMode _procSortMode = ProcSortMode.cpu; ProcSortMode _procSortMode = ProcSortMode.mem;
final _serverProvider = locator<ServerProvider>(); final _serverProvider = locator<ServerProvider>();
@@ -121,10 +121,10 @@ class _ProcessPageState extends State<ProcessPage> {
return RoundRectCard(ListTile( return RoundRectCard(ListTile(
leading: SizedBox( leading: SizedBox(
width: 57, width: 57,
child: TwoLineText(up: proc.pid.toString(), down: 'pid'), child: TwoLineText(up: proc.pid.toString(), down: proc.user),
), ),
title: Text(proc.binary), title: Text(proc.binary),
subtitle: Text(proc.command, style: grey), subtitle: Text(proc.command, style: grey, maxLines: 3, overflow: TextOverflow.fade,),
trailing: Row( trailing: Row(
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
children: [ children: [

View File

@@ -80,7 +80,7 @@ class _SSHPageState extends State<SSHPage> {
_terminalTheme = _isDark ? termDarkTheme : termLightTheme; _terminalTheme = _isDark ? termDarkTheme : termLightTheme;
// Calculate virtkey width / height // Calculate virtkey width / height
_virtKeyWidth = _media.size.width / 7; _virtKeyWidth = _media.size.width / 7;
_virtKeysHeight = _media.size.height * 0.047 * _virtKeysList.length; _virtKeysHeight = _media.size.height * 0.043 * _virtKeysList.length;
} }
@override @override

View File

@@ -34,7 +34,11 @@ class _SSHVirtKeySettingPageState extends State<SSHVirtKeySettingPage> {
} }
Widget _buildBody() { Widget _buildBody() {
final keys = List<VirtKey>.from(_setting.sshVirtKeys.fetch()!); final keys_ = _setting.sshVirtKeys.fetchRaw()!;
final keys = <VirtKey>[];
for (final key in keys_) {
keys.add(key);
}
final disabled = VirtKey.values.where((e) => !keys.contains(e)).toList(); final disabled = VirtKey.values.where((e) => !keys.contains(e)).toList();
final allKeys = [...keys, ...disabled]; final allKeys = [...keys, ...disabled];
return ReorderableListView.builder( return ReorderableListView.builder(
@@ -55,9 +59,7 @@ class _SSHVirtKeySettingPageState extends State<SSHVirtKeySettingPage> {
return; return;
} }
keys.moveById(keys[o], keys[n], _setting.sshVirtKeys); keys.moveById(keys[o], keys[n], _setting.sshVirtKeys);
setState(() { setState(() {});
});
}, },
); );
} }

View File

@@ -475,9 +475,9 @@
baseConfigurationReference = C1C758C41C4E208965A68933 /* Pods-RunnerTests.debug.xcconfig */; baseConfigurationReference = C1C758C41C4E208965A68933 /* Pods-RunnerTests.debug.xcconfig */;
buildSettings = { buildSettings = {
BUNDLE_LOADER = "$(TEST_HOST)"; BUNDLE_LOADER = "$(TEST_HOST)";
CURRENT_PROJECT_VERSION = 363; CURRENT_PROJECT_VERSION = 365;
GENERATE_INFOPLIST_FILE = YES; GENERATE_INFOPLIST_FILE = YES;
MARKETING_VERSION = 1.0.363; MARKETING_VERSION = 1.0.365;
PRODUCT_BUNDLE_IDENTIFIER = tech.lolli.serverBox.RunnerTests; PRODUCT_BUNDLE_IDENTIFIER = tech.lolli.serverBox.RunnerTests;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 5.0; SWIFT_VERSION = 5.0;
@@ -490,9 +490,9 @@
baseConfigurationReference = 15AF97DF993E8968098D6EBE /* Pods-RunnerTests.release.xcconfig */; baseConfigurationReference = 15AF97DF993E8968098D6EBE /* Pods-RunnerTests.release.xcconfig */;
buildSettings = { buildSettings = {
BUNDLE_LOADER = "$(TEST_HOST)"; BUNDLE_LOADER = "$(TEST_HOST)";
CURRENT_PROJECT_VERSION = 363; CURRENT_PROJECT_VERSION = 365;
GENERATE_INFOPLIST_FILE = YES; GENERATE_INFOPLIST_FILE = YES;
MARKETING_VERSION = 1.0.363; MARKETING_VERSION = 1.0.365;
PRODUCT_BUNDLE_IDENTIFIER = tech.lolli.serverBox.RunnerTests; PRODUCT_BUNDLE_IDENTIFIER = tech.lolli.serverBox.RunnerTests;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 5.0; SWIFT_VERSION = 5.0;
@@ -505,9 +505,9 @@
baseConfigurationReference = 7CFA7DE7FABA75685DFB6948 /* Pods-RunnerTests.profile.xcconfig */; baseConfigurationReference = 7CFA7DE7FABA75685DFB6948 /* Pods-RunnerTests.profile.xcconfig */;
buildSettings = { buildSettings = {
BUNDLE_LOADER = "$(TEST_HOST)"; BUNDLE_LOADER = "$(TEST_HOST)";
CURRENT_PROJECT_VERSION = 363; CURRENT_PROJECT_VERSION = 365;
GENERATE_INFOPLIST_FILE = YES; GENERATE_INFOPLIST_FILE = YES;
MARKETING_VERSION = 1.0.363; MARKETING_VERSION = 1.0.365;
PRODUCT_BUNDLE_IDENTIFIER = tech.lolli.serverBox.RunnerTests; PRODUCT_BUNDLE_IDENTIFIER = tech.lolli.serverBox.RunnerTests;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 5.0; SWIFT_VERSION = 5.0;