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/IBoxFormParams.cs |   60 ++++++++++++++++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 52 insertions(+), 8 deletions(-)

diff --git a/WinFrmUI/IBox.WinFrmUI/Form/IBoxFormParams.cs b/WinFrmUI/IBox.WinFrmUI/Form/IBoxFormParams.cs
index 1bc2ff0..d24d7e5 100644
--- a/WinFrmUI/IBox.WinFrmUI/Form/IBoxFormParams.cs
+++ b/WinFrmUI/IBox.WinFrmUI/Form/IBoxFormParams.cs
@@ -15,7 +15,8 @@
         }
         public void HideButton()
         {
-            simpleButton1.Visible = simpleButton2.Visible = simpleButton5.Visible = simpleButton3.Visible = simpleButton4.Visible = simpleButton6.Visible = false;
+            //simpleButton1.Visible = simpleButton2.Visible = simpleButton5.Visible = simpleButton3.Visible = simpleButton4.Visible = simpleButton6.Visible = false;
+            layoutControlItem4.Visibility = layoutControlItem19.Visibility = layoutControlItem20.Visibility = layoutControlItem21.Visibility = layoutControlItem22.Visibility = layoutControlItem25.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
         }
         public IBoxFormParams()
         {
@@ -28,15 +29,50 @@
         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.getparamsCode:
+                            {
+                                var order = IBoxHelper.HttpGet(content);
+                                var result = IBoxHelper.GetContent(order);
+                                if (!string.IsNullOrEmpty(result))
+                                {
+                                    var model = JsonHelper.Json2Object<IBoxConfigViewModel>(result);
+                                    BindData(model, false);
+                                }
+                                break;
+                            }
+                        
+                        default:
+                            IBoxHelper.HttpGet(content);
+                            break;
+                    }
+                }
+                else
+                {
+                    MessageBoxHelper.ShowWarning("缃戠粶杩炴帴澶辫触锛岃妫�鏌ョ綉缁�");
+                }
+            }
         }
 
         private void simpleButton1_Click(object sender, EventArgs e)
         {
             //淇濆瓨鍙傛暟
             Save();
-            MessageBoxHelper.ShowInfo("淇濆瓨鎴愬姛");
         }
 
         /// <summary>
@@ -74,6 +110,8 @@
                 }
             };
             SendText(IBoxHelper.startCode + IBoxHelper.saveparamsCode + IBoxHelper.paramCode + JsonHelper.Object2Json(model) + IBoxHelper.endCode);
+
+            MessageBoxHelper.ShowInfo("淇濆瓨鎴愬姛");
         }
 
         /// <summary>
@@ -160,6 +198,8 @@
         public void RestartWebServer()
         {
             SendText(IBoxHelper.startCode + IBoxHelper.restartserviceCode + IBoxHelper.paramCode + "WebServer" + IBoxHelper.endCode);
+            MessageBoxHelper.ShowInfo("鎿嶄綔鎴愬姛");
+
 
         }
 
@@ -167,7 +207,6 @@
         {
             //閲嶅惎鍒嗘瀽鏈嶅姟
             RestartAnalyService();
-            MessageBoxHelper.ShowInfo("鎿嶄綔鎴愬姛");
         }
 
         /// <summary>
@@ -176,13 +215,14 @@
         public void RestartAnalyService()
         {
             SendText(IBoxHelper.startCode + IBoxHelper.restartserviceCode + IBoxHelper.paramCode + "AnalyConsole" + IBoxHelper.endCode);
+            MessageBoxHelper.ShowInfo("鎿嶄綔鎴愬姛");
+
         }
 
         private void simpleButton3_Click(object sender, EventArgs e)
         {
             //閲嶅惎鎺ㄩ�佹湇鍔�
             RestartPostDataService();
-            MessageBoxHelper.ShowInfo("鎿嶄綔鎴愬姛");
         }
 
         /// <summary>
@@ -191,13 +231,14 @@
         public void RestartPostDataService()
         {
             SendText(IBoxHelper.startCode + IBoxHelper.restartserviceCode + IBoxHelper.paramCode + "PostDataConsole" + IBoxHelper.endCode);
+            MessageBoxHelper.ShowInfo("鎿嶄綔鎴愬姛");
+
         }
 
         private void simpleButton2_Click(object sender, EventArgs e)
         {
             //閲嶅惎閲囬泦鏈嶅姟
             RestartDataDockingService();
-            MessageBoxHelper.ShowInfo("鎿嶄綔鎴愬姛");
         }
 
         /// <summary>
@@ -206,13 +247,14 @@
         public void RestartDataDockingService()
         {
             SendText(IBoxHelper.startCode + IBoxHelper.restartserviceCode + IBoxHelper.paramCode + "DataDockingConsole" + IBoxHelper.endCode);
+            MessageBoxHelper.ShowInfo("鎿嶄綔鎴愬姛");
+
         }
 
         private void simpleButton6_Click(object sender, EventArgs e)
         {
             //娓呯悊鏁版嵁
             RestartClearUpData();
-            MessageBoxHelper.ShowInfo("鎿嶄綔鎴愬姛");
         }
 
         /// <summary>
@@ -221,6 +263,8 @@
         public void RestartClearUpData()
         {
             SendText(IBoxHelper.startCode + IBoxHelper.clearupdataCode + IBoxHelper.paramCode + IBoxHelper.endCode);
+            MessageBoxHelper.ShowInfo("鎿嶄綔鎴愬姛");
+
         }
     }
 }

--
Gitblit v1.9.3