From d1807075581920a8c94a409b11a9c88dd869be1e Mon Sep 17 00:00:00 2001
From: ningshuxia <ningshuxia0927@outlook.com>
Date: 星期四, 20 三月 2025 16:57:33 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/IBox.WinFrmUI/Form/IBoxFormSystemInfo.cs | 28 +++++++++++++++++++---------
1 files changed, 19 insertions(+), 9 deletions(-)
diff --git a/WinFrmUI/IBox.WinFrmUI/Form/IBoxFormSystemInfo.cs b/WinFrmUI/IBox.WinFrmUI/Form/IBoxFormSystemInfo.cs
index fcd6934..54c5625 100644
--- a/WinFrmUI/IBox.WinFrmUI/Form/IBoxFormSystemInfo.cs
+++ b/WinFrmUI/IBox.WinFrmUI/Form/IBoxFormSystemInfo.cs
@@ -6,7 +6,7 @@
{
public partial class IBoxFormSystemInfo : DocumentPage
{
-
+
public IBoxFormSystemInfo()
{
this.PageTitle.Caption = "璁惧淇℃伅";
@@ -30,7 +30,7 @@
{
if (IBoxHelper.Ping())
{
- var smsg = content.Split(new string[] { IBoxHelper.paramCode,IBoxHelper.startCode }, StringSplitOptions.RemoveEmptyEntries);
+ var smsg = content.Split(new string[] { IBoxHelper.paramCode, IBoxHelper.startCode }, StringSplitOptions.RemoveEmptyEntries);
if (smsg.Length < 2)
{
return;
@@ -71,18 +71,28 @@
textEdit2.Text = model.Wlan0IpAddress.Replace("\n", "");
textEdit3.Text = model.SystemVersion;
textEdit4.Text = model.TotalRunTime;
- textEdit10.Text = model.CurrentTime.Replace(";", "");
- var dic = GetDuDic(model.Du);
- textEdit5.Text = GetDuString(dic, "/usr/ebox");
- textEdit6.Text = GetDuString(dic, "/usr/ebox/Data");
- textEdit7.Text = GetDuString(dic, "/usr/ebox/DataDockingConsole");
- textEdit8.Text = GetDuString(dic, "/usr/ebox/PostDataConsole");
- textEdit9.Text = GetDuString(dic, "/usr/ebox/WebServer");
+ try
+ {
+ textEdit10.Text = model.CurrentTime?.Replace(";", "");
+ var dic = GetDuDic(model.Du);
+ if (dic != null)
+ {
+ textEdit5.Text = GetDuString(dic, "/usr/ebox");
+ textEdit6.Text = GetDuString(dic, "/usr/ebox/Data");
+ textEdit7.Text = GetDuString(dic, "/usr/ebox/DataDockingConsole");
+ textEdit8.Text = GetDuString(dic, "/usr/ebox/PostDataConsole");
+ textEdit9.Text = GetDuString(dic, "/usr/ebox/WebServer");
+ }
+ }
+ catch (Exception ex)
+ {
+ }
textEdit11.Text = model.MemUse;
}
private Dictionary<string, string> GetDuDic(string du)
{
+ if (string.IsNullOrEmpty(du)) return null;
return du.Substring(0, du.Length - 1).Split(';').Select(c => c.Split(':')).ToDictionary(b => b[1], b => b[0]);
}
--
Gitblit v1.9.3