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/IBoxFormEnergyAnalysis.cs |   77 +++++++++++++++++++++++++++++++-------
 1 files changed, 63 insertions(+), 14 deletions(-)

diff --git a/WinFrmUI/IBox.WinFrmUI/Form/IBoxFormEnergyAnalysis.cs b/WinFrmUI/IBox.WinFrmUI/Form/IBoxFormEnergyAnalysis.cs
index 4f4f2b2..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()
         {
@@ -33,13 +29,23 @@
             _series_qds.CrosshairLabelPattern = "鍗冨惃姘磋兘鑰�:{V:N2} kW路h/km鲁";
         }
 
-        private void InitDate()
+        public void InitDate()
         {
             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;
+        /// <summary>
+        /// 缁戝畾鏁版嵁
+        /// </summary>
+        /// <param name="models"></param>
         public void BindData(List<PumpEnergyViewModel> models)
         {
             _models = models;
@@ -53,7 +59,7 @@
         private Series _series_ydl { get { return this.chartControl1.Series[0]; } }
         private Series _series_qds { get { return this.chartControl1.Series[2]; } }
 
-        private void SetChart(List<PumpEnergyViewModel> models)
+        public void SetChart(List<PumpEnergyViewModel> models)
         {
             this.chartControl1.BeginInit();
 
@@ -68,7 +74,7 @@
             }
 
 
-                        this.chartControl1.EndInit();
+            this.chartControl1.EndInit();
         }
 
         private void EboxFormEnergyAnalysis_Load(object sender, EventArgs e)
@@ -77,7 +83,7 @@
             Search();
         }
 
-        private void Search()
+        public void Search()
         {
             var m = new GetCalcValueModel()
             {
@@ -85,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>
         /// 鏌ヨ
@@ -177,7 +218,7 @@
         /// <param name="e"></param>
         private void simpleButton3_Click(object sender, EventArgs e)
         {
-            this.dateEditStartDate.Text = DateTime.Now.AddMonths(-30).ToString("yyyy-MM-dd");
+            this.dateEditStartDate.Text = DateTime.Now.AddMonths(-3).ToString("yyyy-MM-dd");
             this.dateEditEndDate.Text = DateTime.Now.ToString("yyyy-MM-dd");
             Search();
         }
@@ -208,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