From 1ec65a7b983a7d519c3602d20a855ac1bac1825e Mon Sep 17 00:00:00 2001
From: duheng <2286773002@qq.com>
Date: 星期四, 20 三月 2025 16:24:40 +0800
Subject: [PATCH] 修改电价辅助类的命名空间
---
WinFrmUI/IBox.WinFrmUI/Form/IBoxFormLog.cs | 147 +++++++++++++++++++++++++-----------------------
1 files changed, 76 insertions(+), 71 deletions(-)
diff --git a/WinFrmUI/IBox.WinFrmUI/Form/IBoxFormLog.cs b/WinFrmUI/IBox.WinFrmUI/Form/IBoxFormLog.cs
index dd2086f..9284079 100644
--- a/WinFrmUI/IBox.WinFrmUI/Form/IBoxFormLog.cs
+++ b/WinFrmUI/IBox.WinFrmUI/Form/IBoxFormLog.cs
@@ -1,28 +1,27 @@
-锘縰sing Yw;
+锘縰sing DevExpress.XtraEditors;
+using DevExpress.XtraLayout;
+using Yw;
using Yw.WinFrmUI;
-
namespace IBox.WinFrmUI
{
public partial class IBoxFormLog : DocumentPage
{
-
- private string startCode = "[&start&]";
- private string endCode = "[&end&]";
- private string paramCode = "[¶m&]";
- private string getlogCode = "getlog";
- private string clearlogCode = "clearlog";
public IBoxFormLog()
{
this.PageTitle.Caption = "鏃ュ織绠＄悊";
InitializeComponent();
}
+ public void HideButton()
+ {
+ //simpleButton1.Visible = simpleButton2.Visible = false;
+ /*layoutControlItem2.Visibility =*/
+ layoutControlItem3.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
+ }
+
private void EboxFormLog_Load(object sender, EventArgs e)
{
- //BluetoothHelper.GetInstance().SMR -= null;
- //BluetoothHelper.GetInstance().SMR += new BluetoothHelper.ShowMessReturn(GetReceive);
- //BluetoothHelper.GetInstance().ListenerData();
this.dateEditStartDate.EditValue = DateTime.Now.ToString("yyyy-MM-dd");
this.dateEditEndDate.EditValue = DateTime.Now.ToString("yyyy-MM-dd");
SetData();
@@ -34,10 +33,10 @@
LogResult = ""
};
- SendText(startCode + getlogCode + paramCode + JsonHelper.Object2Json(m) + endCode);
+ SendText(IBoxHelper.startCode + IBoxHelper.getlogCode + IBoxHelper.paramCode + JsonHelper.Object2Json(m) + IBoxHelper.endCode);
}
- private void SetData()
+ public void SetData()
{
var dic = GetDic();
imageComboBoxEdit1.Properties.Items.Add("鍏ㄩ儴", "", -1);
@@ -54,54 +53,61 @@
imageComboBoxEdit1.SelectedIndex = 0;
imageComboBoxEdit2.SelectedIndex = 0;
-
- }
-
- public void GetReceive(string msg)
- {
- if (!this.IsHandleCreated || this.IsDisposed || string.IsNullOrEmpty(msg)) return;
- if (msg.StartsWith("error:") && msg.Contains("鐩爣涓绘満鍧忎簡"))
- {
- MessageBoxHelper.ShowWarning("l 钃濈墮璁惧杩炴帴澶辫触锛岃閲嶈瘯!"); return;
- }
- if (!string.IsNullOrEmpty(msg) && msg.Contains(startCode))
- {
- var order = msg.Replace(endCode, "").Replace(startCode, "").Trim();
- SetOrder(order);
- }
- else MessageBoxHelper.ShowWarning("l 钃濈墮璁惧杩炴帴澶辫触");
}
public event EventHandler<string> SendData;
+
private void SendText(string content)
{
- //BluetoothHelper.GetInstance().SendData(content);
- SendData?.Invoke(null, content);
- }
-
- private void SetOrder(string order)
- {
- var smsg = order.Split(new string[] { paramCode }, StringSplitOptions.RemoveEmptyEntries);
- if (smsg.Length < 2)
+ if (SendData != null)
{
- return;
+ SendData?.Invoke(null, content);
}
-
- switch (smsg[0].Trim())
+ else
{
- case "getlog":
- var getloglist = JsonHelper.Json2Object<List<IBoxLogViewModel>>(smsg[1].Trim());
- BindData(getloglist);
- break;
+ if (IBoxHelper.Ping())
+ {
+ var smsg = content.Split(new string[] { IBoxHelper.paramCode, IBoxHelper.startCode }, StringSplitOptions.RemoveEmptyEntries);
+ if (smsg.Length < 2)
+ {
+ return;
+ }
+ switch (smsg[0].Trim())
+ {
+ case IBoxHelper.getlogCode:
+ {
+ var order = IBoxHelper.HttpGet(content);
+ var result = IBoxHelper.GetContent(order);
+ if (!string.IsNullOrEmpty(result))
+ {
+ var model = JsonHelper.Json2Object<List<IBoxLogViewModel>>(result);
+ BindData(model, false);
+ }
+ break;
+ }
+ default:
+ IBoxHelper.HttpGet(content);
+ break;
+ }
+ }
+ else
+ {
+ MessageBoxHelper.ShowWarning("缃戠粶杩炴帴澶辫触锛岃妫�鏌ョ綉缁�");
+ }
}
}
private void simpleButton1_Click(object sender, EventArgs e)
{
+ Search();
+ }
+
+ /// <summary>
+ /// 鏌ヨ
+ /// </summary>
+ public void Search()
+ {
//鏌ヨ
- //SendText(startCode + getlogCode + paramCode + endCode);
- //this.dateEditStartDate.EditValue = DateTime.Now.ToString("yyyy-MM-dd");
- //this.dateEditEndDate.EditValue = DateTime.Now.ToString("yyyy-MM-dd");
var m = new GetCalcValueModel()
{
StartDate = DateTime.Parse(this.dateEditStartDate.EditValue.ToString()),
@@ -110,10 +116,18 @@
LogEvent = imageComboBoxEdit1.EditValue?.ToString()
};
- SendText(startCode + getlogCode + paramCode + JsonHelper.Object2Json(m) + endCode);
+ SendText(IBoxHelper.startCode + IBoxHelper.getlogCode + IBoxHelper.paramCode + JsonHelper.Object2Json(m) + IBoxHelper.endCode);
}
private void simpleButton2_Click(object sender, EventArgs e)
+ {
+ Clear();
+ }
+
+ /// <summary>
+ /// 娓呯┖
+ /// </summary>
+ public void Clear()
{
//娓呯┖
this.Invoke(new Action(() =>
@@ -121,12 +135,11 @@
eboxLogViewModelBindingSource.DataSource = null;
this.gridView1.RefreshData();
}));
- SendText(startCode + clearlogCode + paramCode + endCode);
+ SendText(IBoxHelper.startCode + IBoxHelper.clearlogCode + IBoxHelper.paramCode + IBoxHelper.endCode);
}
private void gridView1_CustomDrawCell(object sender, DevExpress.XtraGrid.Views.Base.RowCellCustomDrawEventArgs e)
{
-
if (e.Column.FieldName == "LogResult")
{
var celValue = e.CellValue.ToString();
@@ -137,14 +150,17 @@
celNewValue = "鎻愮ず";
e.Appearance.ForeColor = Color.Blue;
break;
+
case "fail":
celNewValue = "澶辫触";
e.Appearance.ForeColor = Color.Coral;
break;
+
case "error":
celNewValue = "寮傚父";
e.Appearance.ForeColor = Color.Red;
break;
+
default:
celNewValue = "鎴愬姛";
e.Appearance.ForeColor = Color.Green;
@@ -156,33 +172,15 @@
private Dictionary<string, string> GetDic()
{
-
return new Dictionary<string, string>
{
- //{ "heartbeat", "蹇冭烦" },
- //{ "getbase", "鑾峰彇鍩虹淇℃伅" },
- //{ "getrules", "鑾峰彇瑙勫垯淇℃伅" },
- //{ "saverules", "淇濆瓨瑙勫垯淇℃伅" },
- //{ "getprotocol", "鑾峰彇鍗忚閰嶇疆" },
- //{ "saveprotocol", "淇濆瓨鍗忚閰嶇疆" },
- //{ "getalarmbysignalid", "鑾峰彇鍗曚釜淇″彿鎶ヨ淇℃伅" },
- //{ "getalarmbyday", "鎸夊ぉ鏌ヨ鎶ヨ淇℃伅" },
- //{ "getbysignalidofdayrange", "鏍规嵁鏃ユ湡鑼冨洿鏌ヨ鎶ヨ淇℃伅" },
- //{ "getrealrecord", "鏌ヨ瀹炴椂鏁版嵁" },
- //{ "datadownload", "鏁版嵁涓嬪彂" },
- //{ "gethistoryrecord", "鏌ヨ鍗曚釜淇″彿鍘嗗彶鏁版嵁" },
- //{ "getlog", "鑾峰彇鏃ュ織" },
- //{ "clearlog", "娓呯┖鏃ュ織" },
- //{ "getparams", "鑾峰彇鍙傛暟閰嶇疆" },
- //{ "saveparams", "淇濆瓨鍙傛暟閰嶇疆" },
{ "controll", "鏅鸿兘鎺у埗" },
{ "postdata", "鏁版嵁鎺ㄩ��" },
{ "default", "甯歌" },
{ "datadocking", "鏁版嵁閲囬泦" },
- //{ "getcalvalue", "鑾峰彇鏅鸿兘鎺у埗鏁版嵁" },
- //{ "execcalvalue", "鎵ц鏅鸿兘鎺у埗" }
};
}
+
private void gridView1_CustomColumnDisplayText(object sender, DevExpress.XtraGrid.Views.Base.CustomColumnDisplayTextEventArgs e)
{
if (e.Column.FieldName == "LogEvent")
@@ -210,21 +208,28 @@
case "info":
celNewValue = "鎻愮ず";
break;
+
case "fail":
celNewValue = "澶辫触";
break;
+
case "error":
celNewValue = "寮傚父";
break;
+
default:
celNewValue = "鎴愬姛";
break;
}
e.DisplayText = celNewValue;
}
-
}
+ /// <summary>
+ /// 缁戝畾鏁版嵁
+ /// </summary>
+ /// <param name="eboxLogs"></param>
+ /// <param name="isBlue"></param>
public void BindData(List<IBoxLogViewModel> eboxLogs, bool isBlue = true)
{
if (isBlue)
@@ -242,4 +247,4 @@
}
}
}
-}
+}
\ No newline at end of file
--
Gitblit v1.9.3