Merge branch 'wxr4' into dev-tzy

wxr

2021-06-09 cb6e11c5067ecaba4d8f9907989154167c1e8943

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

@@ -475,10 +475,9 @@
                        break;
                    case ShowFunction.EnergyMonitoring:
                        #region 能源
                        functionCount = FunctionList.List.GetElectricals().Count;
                        functionOnCount = FunctionList.List.GetElectricals().FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
                        functionCount = FunctionList.List.GetEnergyList().Count;
                        functionOnCount = FunctionList.List.GetEnergyList().FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
                        #endregion
                        //functionCount = 1;
                        break;
                    case ShowFunction.Environmental:
                        #region 环境数据
@@ -491,6 +490,10 @@
                    case ShowFunction.Music:
                        functionCount = Music.A31MusicModel.A31MusicModelList.Count;
                        functionOnCount = Music.A31MusicModel.A31MusicModelList.FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
                        if(functionCount == 0)
                        {
                            functionCount = FunctionList.List.GetMusicList().Count;
                        }
                        break;
                    case ShowFunction.Panel:
                        break;
@@ -508,6 +511,9 @@
                        break;
                    case ShowFunction.SecurityCenter:
                        functionCount = FunctionList.List.securities.Count;
#if DEBUG
                        functionCount = 1;
#endif
                        break;

                }
@@ -556,11 +562,12 @@
                {
                    X = Application.GetRealWidth(16),
                    Y = Application.GetRealHeight(14),
                    Width = Application.GetRealWidth(120),
                    Width = Application.GetRealWidth(140),
                    Height = Application.GetRealHeight(24),
                    TextColor = CSS_Color.FirstLevelTitleColor,
                    TextSize = CSS_FontSize.TextFontSize,
                    TextAlignment = TextAlignment.CenterLeft,
                    IsMoreLines = true,
                };
                functionView.AddChidren(btnName);

@@ -814,6 +821,16 @@
                            videoMethod.MianView(this,FunctionList.List.videoIntercom);
                        };
                        break;
                    case ShowFunction.SecurityCenter:
                        btnName.TextID = StringId.SecurityCenter;
                        btnFunctionViewBg.MouseUpEventHandler = (sender, e) =>
                        {
                            var page = new ArmCenterPage();
                            MainPage.BasePageView.AddChidren(page);
                            page.LoadPage();
                            MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
                        };
                        break;

                }
                //界面跳转--音乐跳转自己的界面--环境跳转自己的界面
@@ -840,7 +857,7 @@
#endregion
        }

#region 切换楼层
        #region 切换楼层
        /// <summary>
        /// 楼层显示切换
        /// </summary>
@@ -997,6 +1014,6 @@
        {

        }
#endregion
        #endregion
    }
}