From 9be9ba4e159969fb5e32648c2c34e912ccc3ae6d Mon Sep 17 00:00:00 2001
From: duheng <2286773002@qq.com>
Date: 星期五, 28 三月 2025 14:22:42 +0800
Subject: [PATCH] 优化细节问题

---
 WinFrmUI/IBox.WinFrmUI/Form/IBoxFormEnergyAnalysis.cs |   65 +++++++++++++++++++++++++++-----
 1 files changed, 55 insertions(+), 10 deletions(-)

diff --git a/WinFrmUI/IBox.WinFrmUI/Form/IBoxFormEnergyAnalysis.cs b/WinFrmUI/IBox.WinFrmUI/Form/IBoxFormEnergyAnalysis.cs
index f4a6c41..f0ba076 100644
--- a/WinFrmUI/IBox.WinFrmUI/Form/IBoxFormEnergyAnalysis.cs
+++ b/WinFrmUI/IBox.WinFrmUI/Form/IBoxFormEnergyAnalysis.cs
@@ -10,11 +10,7 @@
 {
     public partial class IBoxFormEnergyAnalysis : DocumentPage
     {
-        private string startCode = "[&start&]";
-        private string endCode = "[&end&]";
-        private string paramCode = "[&param&]";
-        private string getenergyanalyCode = "getenergyanaly";//鑾峰彇鑳借�楀垎鏋愭暟鎹�
-        private string analydayCode = "analyday";//鏍￠獙鑳借�楀垎鏋�
+
 
         public IBoxFormEnergyAnalysis()
         {
@@ -37,6 +33,12 @@
         {
             this.dateEditStartDate.Text = DateTime.Now.AddDays(-7).ToString("yyyy-MM-dd");
             this.dateEditEndDate.Text = DateTime.Now.ToString("yyyy-MM-dd");
+        }
+
+        public void HideButton()
+        {
+            //simpleButton1.Visible = simpleButton2.Visible = simpleButton5.Visible = false;
+            layoutControlItem3.Visibility = layoutControlItem4.Visibility = layoutControlItem10.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
         }
 
         List<PumpEnergyViewModel> _models;
@@ -72,7 +74,7 @@
             }
 
 
-                        this.chartControl1.EndInit();
+            this.chartControl1.EndInit();
         }
 
         private void EboxFormEnergyAnalysis_Load(object sender, EventArgs e)
@@ -89,14 +91,49 @@
                 EndDate = DateTime.Parse(this.dateEditEndDate.EditValue.ToString()),
             };
 
-            SendText(startCode + getenergyanalyCode + paramCode + JsonHelper.Object2Json(m) + endCode);
+            SendText(IBoxHelper.startCode + IBoxHelper.getenergyanalyCode + IBoxHelper.paramCode + JsonHelper.Object2Json(m) + 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,IBoxHelper.startCode }, StringSplitOptions.RemoveEmptyEntries);
+                    if (smsg.Length < 2)
+                    {
+                        return;
+                    }
+                    switch (smsg[0].Trim())
+                    {
+                        case IBoxHelper.getenergyanalyCode:
+                            {
+                                var order = IBoxHelper.HttpGet(content);
+                                var result = IBoxHelper.GetContent(order);
+                                if (!string.IsNullOrEmpty(result))
+                                {
+                                    var model = JsonHelper.Json2Object<List<PumpEnergyViewModel>>(result);
+                                    BindData(model);
+                                }
+                                break;
+                            }
+                        default:
+                            IBoxHelper.HttpGet(content);
+                            break;
+                    }
+                }
+                else
+                {
+                    MessageBoxHelper.ShowWarning("缃戠粶杩炴帴澶辫触锛岃妫�鏌ョ綉缁�");
+                }
+            }
         }
         /// <summary>
         /// 鏌ヨ
@@ -212,11 +249,19 @@
 
         private void simpleButton5_Click(object sender, EventArgs e)
         {
+            Check();
+        }
+
+        /// <summary>
+        /// 鏍￠獙
+        /// </summary>
+        public void Check()
+        {
             var dlg = new AnalyDayForm();
             if (dlg.ShowDialog() == DialogResult.OK)
             {
                 var dt = dlg.CurrDateTime;
-                SendText(startCode + analydayCode + paramCode + dt + endCode);
+                SendText(IBoxHelper.startCode + IBoxHelper.analydayCode + IBoxHelper.paramCode + dt + IBoxHelper.endCode);
                 MessageBoxHelper.ShowInfo("鎿嶄綔鎴愬姛");
             }
         }

--
Gitblit v1.9.3