From 330002911a64ea58d6834b64228870228eb75391 Mon Sep 17 00:00:00 2001
From: qin <a@163.com>
Date: 星期四, 20 三月 2025 16:12:33 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/IBox.WinFrmUI/Form/IBoxFormProtocol.cs | 51 ++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 48 insertions(+), 3 deletions(-)
diff --git a/WinFrmUI/IBox.WinFrmUI/Form/IBoxFormProtocol.cs b/WinFrmUI/IBox.WinFrmUI/Form/IBoxFormProtocol.cs
index 81dc358..877409c 100644
--- a/WinFrmUI/IBox.WinFrmUI/Form/IBoxFormProtocol.cs
+++ b/WinFrmUI/IBox.WinFrmUI/Form/IBoxFormProtocol.cs
@@ -2,6 +2,7 @@
using DevExpress.Utils.Extensions;
using DevExpress.XtraEditors;
using DevExpress.XtraEditors.Controls;
+using DevExpress.XtraLayout;
using Yw;
using Yw.WinFrmUI;
@@ -20,17 +21,59 @@
public event EventHandler<string> SendData;
private void SendText(string 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;
+ }
+ switch (smsg[0].Trim())
+ {
+ case IBoxHelper.getprotocolCode:
+ {
+ var order = IBoxHelper.HttpGet(content);
+ var result = IBoxHelper.GetContent(order);
+ if (!string.IsNullOrEmpty(result))
+ {
+ var model = JsonHelper.Json2Object<IBoxProtocolViewModel>(result);
+ BindData(model, false);
+ }
+ break;
+ }
+ case IBoxHelper.saveprotocolCode:
+ {
+ IBoxHelper.HttpPost(content);
+ break;
+
+ }
+ default:
+ IBoxHelper.HttpGet(content);
+ break;
+ }
+ }
+ else
+ {
+ MessageBoxHelper.ShowWarning("缃戠粶杩炴帴澶辫触锛岃妫�鏌ョ綉缁�");
+ }
+ }
}
public void HideButton()
{
- simpleButton1.Visible = false;
+ //simpleButton1.Visible = false;
+ layoutControlItem4.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
}
private void simpleButton1_Click(object sender, EventArgs e)
{
Save();
- MessageBoxHelper.ShowInfo("鏁版嵁淇濆瓨鎴愬姛!");
}
/// <summary>
@@ -39,6 +82,8 @@
public void Save()
{
SendText(IBoxHelper.startCode + IBoxHelper.saveprotocolCode + IBoxHelper.paramCode + JsonHelper.Object2Json(GetData()) + IBoxHelper.endCode);
+ MessageBoxHelper.ShowInfo("鏁版嵁淇濆瓨鎴愬姛!");
+
}
public void SetData()
{
--
Gitblit v1.9.3