增加面板地暖SPK；增加安卓金茂热水器，光伏储能切图

wxr

2024-09-02 02ef7fd8315dfa7a5d8d3ddc0d04a3d4625dc0b5

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

@@ -89,14 +89,14 @@
            #region top
            FrameLayout topView = new FrameLayout()
            {
                Height = Application.GetRealHeight(64),
                Height = Application.GetRealHeight(74),
                BackgroundColor = CSS_Color.TopViewColor,
            };
            bodyView.AddChidren(topView);

            btnRoomTilte = new Button()
            {
                Y = Application.GetRealHeight(30),
                Y = Application.GetRealHeight(40),
                Width = Application.GetRealWidth(170),
                Height = Application.GetRealHeight(25),
                TextAlignment = TextAlignment.CenterRight,
@@ -111,7 +111,7 @@
            btnFuncTitle = new Button()
            {
                X = Application.GetRealWidth(209),
                Y = Application.GetRealHeight(30),
                Y = Application.GetRealHeight(40),
                Width = Application.GetRealWidth(170),
                Height = Application.GetRealHeight(25),
                TextAlignment = TextAlignment.CenterLeft,
@@ -125,8 +125,8 @@

            contentPageView = new PageLayout()
            {
                Y = Application.GetRealHeight(64),
                Height = Application.GetRealHeight(667 - 64 - 49 + 30),
                Y = Application.GetRealHeight(74),
                Height = Application.GetRealHeight(667 - 74 - 49 + 30),
                BackgroundColor = CSS_Color.MainBackgroundColor,
                IsShowPoint = false
            };
@@ -748,7 +748,14 @@
                    case ShowFunction.SecurityMonitoring:
                        if (!MainPage.NoLoginMode)
                        {
                            functionCount = 1;
                            if (OnAppConfig.Instance.RequestHttpsHost.Contains("bahrain") || !Common.ApiUtlis.Ins.hadInternet)
                            {
                                functionCount = 0;
                            }
                            else
                            {
                                functionCount = 1;
                            }
                        }
                        break;
                    case ShowFunction.Sensor:
@@ -765,19 +772,26 @@
                        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;
                    case ShowFunction.VideoDoorLock:
                        functionCount = FunctionList.List.GetVideoDoorLockList().Count;
                        functionOnCount = FunctionList.List.GetAcstParentList().FindAll((obj) => obj.GetAttrState("status").ToString() == "open"
                            || obj.GetAttrState("status").ToString() == "normal_open").Count;

                        if (Common.ApiUtlis.Ins.hadInternet)
                        {
                            functionCount = FunctionList.List.GetVideoDoorLockList().Count;
                            functionOnCount = FunctionList.List.GetAcstParentList().FindAll((obj) => obj.GetAttrState("status").ToString() == "open"
                                || obj.GetAttrState("status").ToString() == "normal_open").Count;
                        }
                        else
                        {
                            functionCount = 0;
                        }
                        break;
                    case ShowFunction.Aks:
                        functionCount = FunctionList.List.GetVideoControlsList().Count;
#if DEBUG
                        functionCount = 1;
#endif
                        functionOnCount = 1;
                        break;

@@ -848,7 +862,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()
@@ -1164,8 +1178,7 @@
                        };
                        break;
                    case ShowFunction.Acst:
                        btnName.TextID = StringId.Acst;

                    case ShowFunction.InverterJinmao:
                        Button btnJMLogo = new Button()
                        {
                            Y = specialList.Contains(index) ? Application.GetRealWidth(147) : Application.GetRealWidth(104),
@@ -1175,38 +1188,30 @@
                        };
                        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;

                            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;
                            btnFunctionViewBg.MouseUpEventHandler = (sender, e) =>
                            {
                                var page = new InverterJinmaoPage();
                                MainPage.BasePageView.AddChidren(page);
                                page.LoadPage();
                                MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
                            };
                        }
                        break;
                    case ShowFunction.VideoDoorLock:
                        //萤石视频门锁
@@ -1221,6 +1226,8 @@
                        };
                        break;
                    case ShowFunction.Aks:

                        btnFunctionViewBg.UnSelectedImagePath = "FunctionIcon/FunctionBg/AksFunctionBg.png";
                        //埃克斯影音中控
                        btnName.TextID = StringId.jiatingyingyuan;
                        btnFunctionViewBg.MouseUpEventHandler = (sender, e) =>
@@ -1245,7 +1252,7 @@
                    && ShowFunction.VideoIntercom != item
                    && ShowFunction.SecurityCenter != item
                    && ShowFunction.Series != item
                    && ShowFunction.Acst != item)
                    && ShowFunction.Acst != item && ShowFunction.InverterJinmao != item)
                {
                    btnFunctionViewBg.MouseUpEventHandler = (sender, e) =>
                    {
@@ -1473,7 +1480,7 @@

//#if __Android__
                    //适配沉浸式导航栏
                    h5BasePage.Y = Application.GetRealHeight(20);
                    h5BasePage.Y = Application.GetRealHeight(35);
                    h5BasePage.Height = Application.GetRealHeight(646);
//#endif
                    MainPage.BasePageView.AddChidren(h5BasePage);
@@ -1481,7 +1488,14 @@

                    h5BasePage.AddChidren(Inverter.Ins.H5Page);//000
                    string lz = "zh";
                    if (Language.CurrentLanguage != "Chinese")
                    if (Language.CurrentLanguage == "Ukraine") {
                        lz = "ua";
                    }
                    else if (Language.CurrentLanguage == "Chinese")
                    {
                        lz = "zh";
                    }
                    else
                    {
                        lz = "en";
                    }