From 418b0d0a4002bc06ba3a55d1809fe46043f06c09 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期一, 26 九月 2022 14:07:58 +0800
Subject: [PATCH] 光伏更新,金茂科技系统更新

---
 HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs |   42 +++++++++++++++++++++++++++---------------
 1 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs b/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
index 0df5996..95dcd3b 100644
--- a/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
+++ b/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
@@ -1090,7 +1090,11 @@
                             string onoff = btnAcstPower.IsSelected ? "on":"off";
                             Dictionary<string, string> d = new Dictionary<string, string>();
                             d.Add(FunctionAttributeKey.OnOff, onoff);
-                            Control.Ins.SendWriteCommand(FunctionList.List.GetAcstParentList()[0], d);
+
+                            foreach (var temp in FunctionList.List.GetAcstParentList())
+                            {
+                                Control.Ins.SendWriteCommand(temp, d);
+                            }
                         };
 
 
@@ -1189,7 +1193,7 @@
                     TextColor = CSS_Color.MainColor,
                     TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
                     TextAlignment = TextAlignment.CenterLeft,
-                    Text = FunctionList.List.InverterList().Count.ToString(),
+                    Text = FunctionList.List.InverterList().FindAll((temp)=>temp.trait_on_off.curValue.ToString() == "on").Count.ToString(),
                     Tag = "inverter_onCount",
                     BorderWidth = 0,
                 };
@@ -1278,7 +1282,9 @@
 
                 clickButton.MouseUpEventHandler = (sender2, e2) =>
                 {
-                    var h5BasePage = new FrameLayout();
+                    var h5BasePage = new FrameLayout() {
+                        BackgroundColor = CSS_Color.MainBackgroundColor,
+                    };
 
 #if __Android__
                     //閫傞厤瀹夊崜娌夋蹈寮忓鑸爮
@@ -1333,27 +1339,33 @@
                             });
                         }
                     };
+
+
+
                 };
 
                 new System.Threading.Thread(() => {
                     var http = new HttpServerRequest();
                     var pack = http.GetInverterStatisticsInfo();
-                    if(pack!= null)
+                    if (pack != null)
                     {
                         var info = JsonConvert.DeserializeObject<StatisticsInfo>(pack.Data.ToString());
-                        try
+                        if (info != null)
                         {
-                            Application.RunOnMainThread(() =>
+                            try
                             {
-                                btnPowerTenerationToday.Text = Language.StringByID(StringId.PowerTenerationToday).Replace("----", info.totalElectricityPvToday);
-                                btnWorkingMode.Text = Language.StringByID(StringId.WorkingMode).Replace("----", info.workMode);
-                                btnCurrentPowerGeneration.Text = Language.StringByID(StringId.CurrentPowerGeneration).Replace("----", info.powerPvNow);
-                                btnBatterySOC.Text = Language.StringByID(StringId.BatterySOC).Replace("--", info.batterySoc);
-                            });
-                        }
-                        catch (Exception ex)
-                        {
-                            MainPage.Log($"鑾峰彇瀹跺涵鍏変紡缁熻鏁版嵁寮傚父锛歿ex.Message}");
+                                Application.RunOnMainThread(() =>
+                                {
+                                    btnPowerTenerationToday.Text = Language.StringByID(StringId.PowerTenerationToday).Replace("----", info.totalElectricityPvToday);
+                                    btnWorkingMode.Text = Language.StringByID(StringId.WorkingMode).Replace("----", info.workMode);
+                                    btnCurrentPowerGeneration.Text = Language.StringByID(StringId.CurrentPowerGeneration).Replace("----", info.powerPvNow);
+                                    btnBatterySOC.Text = Language.StringByID(StringId.BatterySOC).Replace("--", info.batterySoc);
+                                });
+                            }
+                            catch (Exception ex)
+                            {
+                                MainPage.Log($"鑾峰彇瀹跺涵鍏変紡缁熻鏁版嵁寮傚父锛歿ex.Message}");
+                            }
                         }
                     }
 

--
Gitblit v1.8.0