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/IBoxFormLog.cs |   92 +++++++++++++++++++++++++++++++++++++---------
 1 files changed, 74 insertions(+), 18 deletions(-)

diff --git a/WinFrmUI/IBox.WinFrmUI/Form/IBoxFormLog.cs b/WinFrmUI/IBox.WinFrmUI/Form/IBoxFormLog.cs
index 36f0d07..9284079 100644
--- a/WinFrmUI/IBox.WinFrmUI/Form/IBoxFormLog.cs
+++ b/WinFrmUI/IBox.WinFrmUI/Form/IBoxFormLog.cs
@@ -1,21 +1,23 @@
-锘縰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 = "[&param&]";
-        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)
@@ -31,7 +33,7 @@
                 LogResult = ""
             };
 
-            SendText(startCode + getlogCode + paramCode + JsonHelper.Object2Json(m) + endCode);
+            SendText(IBoxHelper.startCode + IBoxHelper.getlogCode + IBoxHelper.paramCode + JsonHelper.Object2Json(m) + IBoxHelper.endCode);
         }
 
         public void SetData()
@@ -51,17 +53,59 @@
 
             imageComboBoxEdit1.SelectedIndex = 0;
             imageComboBoxEdit2.SelectedIndex = 0;
-
         }
 
         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.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()
         {
             //鏌ヨ
             var m = new GetCalcValueModel()
@@ -72,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(() =>
@@ -83,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();
@@ -99,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;
@@ -118,7 +172,6 @@
 
         private Dictionary<string, string> GetDic()
         {
-
             return new Dictionary<string, string>
                             {
                                 { "controll", "鏅鸿兘鎺у埗" },
@@ -127,6 +180,7 @@
                                 { "datadocking", "鏁版嵁閲囬泦" },
                             };
         }
+
         private void gridView1_CustomColumnDisplayText(object sender, DevExpress.XtraGrid.Views.Base.CustomColumnDisplayTextEventArgs e)
         {
             if (e.Column.FieldName == "LogEvent")
@@ -154,19 +208,21 @@
                     case "info":
                         celNewValue = "鎻愮ず";
                         break;
+
                     case "fail":
                         celNewValue = "澶辫触";
                         break;
+
                     case "error":
                         celNewValue = "寮傚父";
                         break;
+
                     default:
                         celNewValue = "鎴愬姛";
                         break;
                 }
                 e.DisplayText = celNewValue;
             }
-
         }
 
         /// <summary>
@@ -191,4 +247,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

--
Gitblit v1.9.3