From b6da0632c9704414934df0817386976eca1548a2 Mon Sep 17 00:00:00 2001
From: qin <a@163.com>
Date: 星期五, 21 三月 2025 14:57:32 +0800
Subject: [PATCH] 数据分析优化

---
 WinFrmUI/IBox.WinFrmUI/Form/IBoxFormProtocol.cs |  127 +++++++++++++++++++++++++-----------------
 1 files changed, 75 insertions(+), 52 deletions(-)

diff --git a/WinFrmUI/IBox.WinFrmUI/Form/IBoxFormProtocol.cs b/WinFrmUI/IBox.WinFrmUI/Form/IBoxFormProtocol.cs
index 115d47f..877409c 100644
--- a/WinFrmUI/IBox.WinFrmUI/Form/IBoxFormProtocol.cs
+++ b/WinFrmUI/IBox.WinFrmUI/Form/IBoxFormProtocol.cs
@@ -1,7 +1,8 @@
 锘�//using CodeProvider;
 using DevExpress.Utils.Extensions;
+using DevExpress.XtraEditors;
 using DevExpress.XtraEditors.Controls;
-using System.Data;
+using DevExpress.XtraLayout;
 using Yw;
 using Yw.WinFrmUI;
 
@@ -9,47 +10,82 @@
 {
     public partial class IBoxFormProtocol : DocumentPage
     {
-        private string startCode = "[&start&]";
-        private string endCode = "[&end&]";
-        private string paramCode = "[&param&]";
-        private string getprotocolCode = "getprotocol";
-        private string saveprotocolCode = "saveprotocol";
+        
         public IBoxFormProtocol()
         {
             this.PageTitle.Caption = "鍗忚閰嶇疆";
             InitializeComponent();
             SetData();
-            
+
         }
         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;
+                    }
+                    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 GetReceive(string msg)
+        public void HideButton()
         {
-            if (!this.IsHandleCreated || this.IsDisposed || string.IsNullOrEmpty(msg)) return;
-            if (msg.StartsWith("error:") && msg.Contains("鐩爣涓绘満鍧忎簡"))
-            {
-                MessageBoxHelper.ShowError("pr 钃濈墮璁惧杩炴帴澶辫触锛岃閲嶈瘯!"); return;
-            }
-            if (!string.IsNullOrEmpty(msg) && msg.Contains(startCode))
-            {
-                var order = msg.Replace(endCode, "").Replace(startCode, "").Trim();
-                SetOrder(order);
-            }
-            else MessageBoxHelper.ShowError("pr 钃濈墮璁惧杩炴帴澶辫触!");
+            //simpleButton1.Visible  = false;
+            layoutControlItem4.Visibility =  DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
         }
         private void simpleButton1_Click(object sender, EventArgs e)
         {
-            SendText(startCode + saveprotocolCode + paramCode + JsonHelper.Object2Json(GetData()) + endCode);
-            MessageBoxHelper.ShowInfo("鏁版嵁淇濆瓨鎴愬姛!");
+            Save();
         }
 
-        private void SetData()
+        /// <summary>
+        /// 淇濆瓨鏁版嵁
+        /// </summary>
+        public void Save()
+        {
+            SendText(IBoxHelper.startCode + IBoxHelper.saveprotocolCode + IBoxHelper.paramCode + JsonHelper.Object2Json(GetData()) + IBoxHelper.endCode);
+            MessageBoxHelper.ShowInfo("鏁版嵁淇濆瓨鎴愬姛!");
+
+        }
+        public void SetData()
         {
 
             var control = new ProtocolModbus();
@@ -209,28 +245,14 @@
         private void EboxFormProtocol_Load(object sender, EventArgs e)
         {
             Thread.Sleep(500);
-            SendText(startCode + getprotocolCode + paramCode + endCode);
-            //BluetoothHelper.GetInstance().SMR -= null;
-            //BluetoothHelper.GetInstance().SMR += new BluetoothHelper.ShowMessReturn(GetReceive);
+            SendText(IBoxHelper.startCode + IBoxHelper.getprotocolCode + IBoxHelper.paramCode + IBoxHelper.endCode);
         }
 
-        private void SetOrder(string order)
-        {
-            var smsg = order.Split(new string[] { paramCode }, StringSplitOptions.RemoveEmptyEntries);
-            if (smsg.Length < 2)
-            {
-                return;
-            }
-
-            switch (smsg[0].Trim())
-            {
-                case "getprotocol":
-                    var model = JsonHelper.Json2Object<IBoxProtocolViewModel>(smsg[1].Trim());
-                    BindData(model);
-                    break;
-            }
-        }
-
+        /// <summary>
+        /// 缁戝畾鏁版嵁
+        /// </summary>
+        /// <param name="model"></param>
+        /// <param name="isBlue"></param>
         public void BindData(IBoxProtocolViewModel model, bool isBlue = true)
         {
             if (model == null)
@@ -245,14 +267,15 @@
                     stopBits = System.IO.Ports.StopBits.One
                 };
             }
-            if (isBlue) { 
-            this.Invoke(new Action(() =>
+            if (isBlue)
             {
-                var protocols = new dModbus().ProtocolType();
-                var des = protocols.FirstOrDefault(x => x.Value == model.ProtocolType).Key;
-                imageComboBoxEditType.SelectItemByDescription(des);
-                ChangeType(model.ProtocolType, model);
-            }));
+                this.Invoke(new Action(() =>
+                {
+                    var protocols = new dModbus().ProtocolType();
+                    var des = protocols.FirstOrDefault(x => x.Value == model.ProtocolType).Key;
+                    imageComboBoxEditType.SelectItemByDescription(des);
+                    ChangeType(model.ProtocolType, model);
+                }));
             }
             else
             {

--
Gitblit v1.9.3