From 7747fa47185ac45cf3030a2792a1ffc682afe333 Mon Sep 17 00:00:00 2001 From: qin <a@163.com> Date: 星期四, 20 三月 2025 10:41:55 +0800 Subject: [PATCH] 优化IBox界面 --- WinFrmUI/IBox.WinFrmUI/Form/IBoxFormMonitor.cs | 97 +++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 83 insertions(+), 14 deletions(-) diff --git a/WinFrmUI/IBox.WinFrmUI/Form/IBoxFormMonitor.cs b/WinFrmUI/IBox.WinFrmUI/Form/IBoxFormMonitor.cs index 0156f0d..482ac7f 100644 --- a/WinFrmUI/IBox.WinFrmUI/Form/IBoxFormMonitor.cs +++ b/WinFrmUI/IBox.WinFrmUI/Form/IBoxFormMonitor.cs @@ -12,14 +12,7 @@ public partial class IBoxFormMonitor : DocumentPage { - private string startCode = "[&start&]"; - private string endCode = "[&end&]"; - private string paramCode = "[¶m&]"; - private string getbaseCode = "getbase"; - private string getrealrecordCode = "getrealrecord"; - private string gethistoryrecordCode = "gethistoryrecord"; - private string getalarmbydayCode = "getalarmbyday"; - private string getbysignalidofdayrangeCode = "getbysignalidofdayrange"; + //Stopwatch sw = new Stopwatch(); //string swstr=string.Empty; @@ -28,7 +21,10 @@ private List<DataGridMonitorViewModel> dataGridMonitorViewModels = new List<DataGridMonitorViewModel>(); private List<PumpRunStatusViewModel> pumpRunStatusModels = new List<PumpRunStatusViewModel>(); private List<PumpEnergyViewModel> pumpEnergyViewModels = new List<PumpEnergyViewModel>(); - + public void HideButton() + { + layoutControlItem10.Visibility = layoutControlItem3.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never; + } public IBoxFormMonitor() { this.PageTitle.Caption = "瀹炴椂鐩戞祴"; @@ -48,7 +44,7 @@ private void EboxForm_Load(object sender, EventArgs e) { Thread.Sleep(500); - SendText(startCode + getbaseCode + paramCode + endCode); + SendText(IBoxHelper.startCode + IBoxHelper.getbaseCode + IBoxHelper.paramCode + IBoxHelper.endCode); _diagram.EnableAxisXScrolling = true; _diagram.EnableAxisYScrolling = true; _diagram.EnableAxisXZooming = true; @@ -161,6 +157,14 @@ } private void simpleButton1_Click(object sender, EventArgs e) + { + Search(); + } + + /// <summary> + /// 鏌ヨ + /// </summary> + public void Search() { if (currModel == null) { @@ -280,12 +284,12 @@ StartTime = dateEdit1.Text,//.Equals(DateTime.Now.ToString("yyyy-MM-dd")) ? DateTime.Now.AddMinutes(-20).ToString("yyyy-MM-dd HH:mm:ss") : dateEdit1.Text, EndTime = dateEdit2.Text//.Equals(DateTime.Now.ToString("yyyy-MM-dd")) ? DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") : dateEdit2.Text, }; - SendText(startCode + gethistoryrecordCode + paramCode + JsonHelper.Object2Json(m) + endCode); + SendText(IBoxHelper.startCode + IBoxHelper.gethistoryrecordCode + IBoxHelper.paramCode + JsonHelper.Object2Json(m) + IBoxHelper.endCode); } private void GetRealData(object sender, EventArgs e) { - SendText(startCode + getrealrecordCode + paramCode + endCode); + SendText(IBoxHelper.startCode + IBoxHelper.getrealrecordCode + IBoxHelper.paramCode + IBoxHelper.endCode); } private void gridView1_CustomDrawCell(object sender, DevExpress.XtraGrid.Views.Base.RowCellCustomDrawEventArgs e) @@ -301,8 +305,73 @@ public event EventHandler<string> SendData; private void SendText(string content) { - //BluetoothHelper.GetInstance().SendData(content); - SendData?.Invoke(null, content); + if (SendData != null) + { + SendData?.Invoke(null, content); + + } + else + { + if (IBoxHelper.Ping()) + { + var smsg = content.Split(new string[] { IBoxHelper.paramCode, IBoxHelper.startCode }, StringSplitOptions.RemoveEmptyEntries); + if (smsg.Length < 2) + { + return; + } + var order = IBoxHelper.HttpGet(content); + var result = IBoxHelper.GetContent(order); + + switch (smsg[0].Trim()) + { + case IBoxHelper.getbaseCode: + { + if (!string.IsNullOrEmpty(result)) + { + var model = JsonHelper.Json2Object<List<StationMonitorListGroupMobileDto>>(result); + BindGrid(model, false); + } + break; + } + case IBoxHelper.getrealrecordCode: + { + if (!string.IsNullOrEmpty(result)) + { + var getrealrecordlist = JsonHelper.Json2Object<List<MonitorRealRecord>>(result); + SetRealRecord(getrealrecordlist, false); + } + break; + } + case IBoxHelper.gethistoryrecordCode: + { + if (!string.IsNullOrEmpty(result)) + { + var b = result.Split('|')[1]; + var gethistoryrecordlist = new List<MonitorRecord>(); + + if (!string.IsNullOrEmpty(b)) + { + var c = b.Split('|'); + foreach (var item in c) + { + var m = new MonitorRecord().FromString(item); + gethistoryrecordlist.Add(m); + } + } + SetChartData(gethistoryrecordlist, false); + } + break; + } + default: + IBoxHelper.HttpGet(content); + break; + } + } + else + { + MessageBoxHelper.ShowWarning("缃戠粶杩炴帴澶辫触锛岃妫�鏌ョ綉缁�"); + } + } } private void simpleButton5_Click(object sender, EventArgs e) -- Gitblit v1.9.3