opt.: bsd cpu

This commit is contained in:
lollipopkit
2023-08-22 21:18:46 +08:00
parent 417cb4c89d
commit 3475e6ec91
2 changed files with 18 additions and 11 deletions

View File

@@ -112,7 +112,7 @@ Cpus parseBsdCpu(String raw) {
if (percents.length != 3) return initCpuStatus; if (percents.length != 3) return initCpuStatus;
return initCpuStatus return initCpuStatus
..now = [ ..now = [
OneTimeCpuStatus('cpu', percents[0].toInt(), percents[1].toInt(), 0, OneTimeCpuStatus('cpu', percents[0].toInt(), 0, 0,
percents[2].toInt(), 0, 0, 0) percents[2].toInt() + percents[1].toInt(), 0, 0, 0)
]; ];
} }

View File

@@ -5,6 +5,7 @@ import 'package:toolbox/core/extension/navigator.dart';
import 'package:toolbox/core/extension/order.dart'; import 'package:toolbox/core/extension/order.dart';
import 'package:toolbox/data/model/server/cpu.dart'; import 'package:toolbox/data/model/server/cpu.dart';
import 'package:toolbox/data/model/server/server_private_info.dart'; import 'package:toolbox/data/model/server/server_private_info.dart';
import 'package:toolbox/data/model/server/system.dart';
import 'package:toolbox/view/widget/server_func_btns.dart'; import 'package:toolbox/view/widget/server_func_btns.dart';
import '../../../core/extension/numx.dart'; import '../../../core/extension/numx.dart';
@@ -115,6 +116,20 @@ class _ServerDetailPageState extends State<ServerDetailPage>
Widget _buildCPUView(ServerStatus ss) { Widget _buildCPUView(ServerStatus ss) {
final percent = ss.cpu.usedPercent(coreIdx: 0).toInt(); final percent = ss.cpu.usedPercent(coreIdx: 0).toInt();
final details = [
_buildDetailPercent(ss.cpu.user, 'user'),
width13,
_buildDetailPercent(ss.cpu.idle, 'idle')
];
if (ss.system == SystemType.linux) {
details.addAll([
width13,
_buildDetailPercent(ss.cpu.sys, 'sys'),
width13,
_buildDetailPercent(ss.cpu.iowait, 'io'),
]);
}
return RoundRectCard( return RoundRectCard(
Padding( Padding(
padding: roundRectCardPadding, padding: roundRectCardPadding,
@@ -128,15 +143,7 @@ class _ServerDetailPageState extends State<ServerDetailPage>
textSize27, textSize27,
), ),
Row( Row(
children: [ children: details,
_buildDetailPercent(ss.cpu.user, 'user'),
width13,
_buildDetailPercent(ss.cpu.sys, 'sys'),
width13,
_buildDetailPercent(ss.cpu.iowait, 'io'),
width13,
_buildDetailPercent(ss.cpu.idle, 'idle')
],
) )
], ],
), ),