Merge branch 'feature/v2.5_极光推送' into feature/V2.6.0_google

wxr

2024-09-11 a3dfbcd5218270f9a75e6e32807b08215270b657

 HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs

@@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
using System.Security.Cryptography;
using HDL_ON.DAL.Server;
using HDL_ON.DriverLayer;
using HDL_ON.Entity;
@@ -759,7 +760,11 @@
                        break;
                    case ShowFunction.Acst:
                        functionCount = FunctionList.List.GetAcstParentList().Count;
                        functionOnCount = FunctionList.List.GetAcstParentList().FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
                        functionOnCount = 0;
                        break;
                    case ShowFunction.InverterJinmao:
                        functionCount = FunctionList.List.GetInverterJinmaoList().Count;
                        functionOnCount = 0;
                        break;
                   
                }
@@ -824,7 +829,7 @@
                    && item != ShowFunction.Music
                    && item != ShowFunction.EnergyMonitoring
                    && item != ShowFunction.SecurityCenter
                    && item != ShowFunction.Acst && item != ShowFunction.IpCam
                    && item != ShowFunction.Acst && item != ShowFunction.IpCam && item != ShowFunction.InverterJinmao
                    && functionCount != 0)
                {
                    btnFunctionCount = new Button()
@@ -1133,8 +1138,14 @@
                        };
                        break;
                    case ShowFunction.Acst:
                        btnName.TextID = StringId.Acst;

                    case ShowFunction.InverterJinmao:
                        //if(item == ShowFunction.Acst)
                        //{
                        //    btnFunctionViewBg.UnSelectedImagePath = "FunctionIcon/FunctionBg/SecurityMonitoringFunctionBg.png";
                        //}else if (item == ShowFunction.InverterJinmao)
                        //{
                        //    btnFunctionViewBg.UnSelectedImagePath = "FunctionIcon/FunctionBg/SecurityMonitoringFunctionBg.png";
                        //}
                        Button btnJMLogo = new Button()
                        {
                            Y = specialList.Contains(index) ? Application.GetRealWidth(147) : Application.GetRealWidth(104),
@@ -1143,39 +1154,65 @@
                            Height = Application.GetRealWidth(57),
                        };
                        functionView.AddChidren(btnJMLogo);
                        

                        //Button btnAcstPower = new Button()
                        //{
                        //    X = Application.GetRealWidth(120),
                        //    Y = specialList.Contains(index) ? Application.GetRealWidth(160) : Application.GetRealWidth(117),
                        //    Width = Application.GetRealWidth(32),
                        //    Height = Application.GetRealWidth(32),
                        //    SelectedImagePath = "Public/PowerOpen.png",
                        //    UnSelectedImagePath = "Public/PowerClose.png",
                        //    IsSelected = functionOnCount > 0,
                        //    Tag = item + "_AllControl",
                        //};
                        //functionView.AddChidren(btnAcstPower);
                        //btnAcstPower.MouseUpEventHandler = (sender, e) =>
                        //{
                        //    btnAcstPower.IsSelected = !btnAcstPower.IsSelected;
                        //    string onoff = btnAcstPower.IsSelected ? "on" : "off";
                        //    Dictionary<string, string> d = new Dictionary<string, string>();
                        //    d.Add(FunctionAttributeKey.OnOff, onoff);
                        //    foreach (var temp in FunctionList.List.GetAcstParentList())
                        //    {
                        //        Control.Ins.SendWriteCommand(temp, d);
                        //    }
                        //};


                        btnFunctionViewBg.MouseUpEventHandler = (sender, e) =>
                        if (item == ShowFunction.Acst)
                        {
                            var page = new AcstParentPage();
                            MainPage.BasePageView.AddChidren(page);
                            page.LoadPage();
                            MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
                        };
                            btnName.TextID = StringId.Acst;
                            try
                            {
                                var acstFunction = FunctionList.List.GetAcstParentList()[0];
                                btnName.Text = acstFunction.name;
                                if (acstFunction.extend.Contains("jinmao") && acstFunction.extend.Contains("true"))
                                {
                                    btnJMLogo.Visible = true;
                                }
                                else
                                {
                                    btnJMLogo.Visible = false;
                                }

                            }
                            catch (Exception ex)
                            {
                                MainPage.Log("Error", $"加载金茂科技系统主控名称异常:{ex.Message}");
                            }
                            btnFunctionViewBg.MouseUpEventHandler = (sender, e) =>
                            {
                                var page = new AcstParentPage();
                                MainPage.BasePageView.AddChidren(page);
                                page.LoadPage();
                                MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
                            };
                        }
                        else if (item == ShowFunction.InverterJinmao)
                        {
                            btnName.TextID = StringId.NewEnergy;
                            try
                            {
                                var jinmaoInverterFunction = FunctionList.List.GetInverterJinmaoList()[0];
                                btnName.Text = jinmaoInverterFunction.name;
                                if (jinmaoInverterFunction.extend.Contains("jinmao") && jinmaoInverterFunction.extend.Contains("true"))
                                {
                                    btnJMLogo.Visible = true;
                                }
                                else
                                {
                                    btnJMLogo.Visible = false;
                                }
                            }
                            catch (Exception ex)
                            {
                                MainPage.Log("Error", $"加载金茂储能名称异常:{ex.Message}");
                            }
                            btnFunctionViewBg.MouseUpEventHandler = (sender, e) =>
                            {
                                var page = new InverterJinmaoPage();
                                MainPage.BasePageView.AddChidren(page);
                                page.LoadPage();
                                MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
                            };
                        }
                        break;

                }
@@ -1186,7 +1223,7 @@
                    && ShowFunction.VideoIntercom != item
                    && ShowFunction.SecurityCenter != item
                    && ShowFunction.Series != item
                    && ShowFunction.Acst != item)
                    && ShowFunction.Acst != item && ShowFunction.InverterJinmao != item)
                {
                    btnFunctionViewBg.MouseUpEventHandler = (sender, e) =>
                    {