From 28a7344a9f352624c9f44cc3fcb38d7226d5a754 Mon Sep 17 00:00:00 2001
From: qin <a@163.com>
Date: 星期三, 19 三月 2025 09:10:02 +0800
Subject: [PATCH] 优化IBox接口请求

---
 WinFrmUI/IBox.WinFrmUI/Form/IBoxFormDataFilter.cs |   77 +++++++++++++++++++++++++++++++++-----
 1 files changed, 66 insertions(+), 11 deletions(-)

diff --git a/WinFrmUI/IBox.WinFrmUI/Form/IBoxFormDataFilter.cs b/WinFrmUI/IBox.WinFrmUI/Form/IBoxFormDataFilter.cs
index 56ade62..83758ca 100644
--- a/WinFrmUI/IBox.WinFrmUI/Form/IBoxFormDataFilter.cs
+++ b/WinFrmUI/IBox.WinFrmUI/Form/IBoxFormDataFilter.cs
@@ -1,5 +1,6 @@
 锘縰sing DevExpress.XtraCharts;
 using DevExpress.XtraEditors;
+using DevExpress.XtraLayout;
 using System.IO;
 using System.Text;
 using Yw;
@@ -9,29 +10,63 @@
 {
     public partial class IBoxFormDataFilter : DocumentPage
     {
-        private string startCode = "[&start&]";
-        private string endCode = "[&end&]";
-        private string paramCode = "[&param&]";
-        private string getfilterCode = "getfilter";
-        private string savefilterCode = "savefilter";
+
         public IBoxFormDataFilter()
         {
             InitializeComponent();
             imageComboBoxEdit1.EditValue = "Flow";
             InitChart();
         }
-
-
+        public void HideButton()
+        {
+            //simpleButton1.Visible = simpleButton2.Visible = simpleButton3.Visible = simpleButton4.Visible = false;
+            layoutControlItem7.Visibility = layoutControlItem9.Visibility = layoutControlItem8.Visibility = layoutControlItem3.Visibility =  DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
+        }
         private void EboxFormDataFilter_Load(object sender, EventArgs e)
         {
-            SendText(startCode + getfilterCode + paramCode + endCode);
+            SendText(IBoxHelper.startCode + IBoxHelper.getfilterCode + IBoxHelper.paramCode + IBoxHelper.endCode);
         }
 
         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 }, StringSplitOptions.RemoveEmptyEntries);
+                    if (smsg.Length < 2)
+                    {
+                        return;
+                    }
+                    switch (smsg[0].Trim())
+                    {
+                        case IBoxHelper.getfilterCode:
+                            {
+                                var order = IBoxHelper.HttpGet(content);
+                                var result = IBoxHelper.GetContent(order);
+                                if (!string.IsNullOrEmpty(result))
+                                {
+                                    var model = JsonHelper.Json2Object<IBoxFilterViewModel>(result);
+                                    BindData(model, false);
+                                }
+                                break;
+                            }
+                        default:
+                            IBoxHelper.HttpGet(content);
+                            break;
+                    }
+                }
+                else
+                {
+                    MessageBoxHelper.ShowWarning("缃戠粶杩炴帴澶辫触锛岃妫�鏌ョ綉缁�");
+                }
+            }
         }
 
         /// <summary>
@@ -122,6 +157,14 @@
         }
         private void simpleButton2_Click_1(object sender, EventArgs e)
         {
+            ReSet();
+        }
+
+        /// <summary>
+        /// 淇j
+        /// </summary>
+        public void ReSet()
+        {
             var isControlInput = checkEditIsControlInput.Checked;
             var RValue = double.Parse(textEditRValue.Text);
             var QValue = double.Parse(textEditQValue.Text);
@@ -154,11 +197,15 @@
         IBoxFilterViewModel model = new IBoxFilterViewModel();
         private void simpleButton4_Click(object sender, EventArgs e)
         {
+            Save();            
+        }
 
+        public void Save()
+        {
             model.IsFlowFilter = checkEditIsFlow.Checked;
             model.IsPressFilter = checkEditIsPress.Checked;
             SetValue();
-            SendText(startCode + savefilterCode + paramCode + JsonHelper.Object2Json(model) + endCode);
+            SendText(IBoxHelper.startCode + IBoxHelper.savefilterCode + IBoxHelper.paramCode + JsonHelper.Object2Json(model) + IBoxHelper.endCode);
             MessageBoxHelper.ShowInfo("淇濆瓨鎴愬姛");
         }
 
@@ -197,6 +244,14 @@
 
         private void simpleButton1_Click(object sender, EventArgs e)
         {
+            Import();
+        }
+
+        /// <summary>
+        /// 瀵煎叆
+        /// </summary>
+        public void Import()
+        {
             #region Load
             ClearChart();
 

--
Gitblit v1.9.3