- spi: use ip as name if empty
- server tab ui
- only display io speed when available
This commit is contained in:
lollipopkit
2023-11-03 22:13:18 +08:00
parent a1b9cecebb
commit e80f6d4cc2
3 changed files with 16 additions and 16 deletions

View File

@@ -44,8 +44,9 @@ class DiskIO extends TimeSeq<DiskIOPiece> {
(String?, String?) getSpeed(String dev) {
final (read_, write_) = _getSpeed(dev);
final read = '${read_?.convertBytes}/s';
final write = '${write_?.convertBytes}/s';
if (read_ == null || write_ == null) return (null, null);
final read = '${read_.convertBytes}/s';
final write = '${write_.convertBytes}/s';
return (read, write);
}

View File

@@ -393,7 +393,9 @@ class _ServerEditPageState extends State<ServerEditPage> {
}
final spi = ServerPrivateInfo(
name: _nameController.text,
name: _nameController.text.isEmpty
? _ipController.text
: _nameController.text,
ip: _ipController.text,
port: int.parse(_portController.text),
user: _usernameController.text,

View File

@@ -212,8 +212,8 @@ class _ServerPageState extends State<ServerPage>
Widget _wrapWithSizedbox(Widget child) {
return SizedBox(
width: _useDoubleColumn
? (_media.size.width - 146) / 10
: (_media.size.width - 74) / 5,
? (_media.size.width - 137) / 8
: (_media.size.width - 74) / 4,
child: child,
);
}
@@ -307,17 +307,14 @@ class _ServerPageState extends State<ServerPage>
List<Widget> _buildNormalCard(ServerStatus ss, ServerPrivateInfo spi) {
return [
UIs.height13,
Padding(
padding: const EdgeInsets.symmetric(horizontal: 13),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
_wrapWithSizedbox(_buildPercentCircle(ss.cpu.usedPercent())),
_wrapWithSizedbox(_buildPercentCircle(ss.mem.usedPercent * 100)),
_wrapWithSizedbox(_buildNet(ss, spi.id)),
_wrapWithSizedbox(_buildDisk(ss, spi.id)),
],
),
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
_wrapWithSizedbox(_buildPercentCircle(ss.cpu.usedPercent())),
_wrapWithSizedbox(_buildPercentCircle(ss.mem.usedPercent * 100)),
_wrapWithSizedbox(_buildNet(ss, spi.id)),
_wrapWithSizedbox(_buildDisk(ss, spi.id)),
],
),
UIs.height13,
if (Stores.setting.moveOutServerTabFuncBtns.fetch() &&