数据结构优化修改

wei

2021-03-08 37c315988c2dc11e4f477233f7a9f87d57bb61aa

 HDL_ON/UI/UI2/FuntionControlView/Electrical/TVPage.cs

@@ -43,7 +43,8 @@
        #endregion

        #region 区域变量
        TV tv;
        TV tvTemp = new TV();
        Function function;
        Button btnCollection_Out;
        Button btnFunctionName_Out;
        Button btnFromFloor_Out;
@@ -56,7 +57,7 @@
        public TVPage(Function func)
        {
            bodyView = this;
            tv = func as TV;
            function = func;
        }


@@ -86,7 +87,7 @@
                TextColor = CSS_Color.FirstLevelTitleColor,
                TextAlignment = TextAlignment.CenterLeft,
                TextSize = CSS_FontSize.EmphasisFontSize_FirstLevel,
                Text = tv.name,
                Text = function.name,
            };
            controlView.AddChidren(btnFunctionName);

@@ -99,7 +100,7 @@
                TextColor = CSS_Color.PromptingColor1,
                TextAlignment = TextAlignment.CenterLeft,
                TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
                Text = tv.GetRoomListName()
                Text = function.GetRoomListName()
            };
            controlView.AddChidren(btnFromFoorAndRoom);

@@ -111,7 +112,7 @@
                Height = Application.GetMinRealAverage(40),
                SelectedImagePath = "Collection/CollectionIcon.png",
                UnSelectedImagePath = "Collection/CollectionGrayIcon.png",
                IsSelected = tv.collect
                IsSelected = function.collect
            };
            //controlView.AddChidren(btnCollection);
            //2020-12-16 如果是成员隐藏收藏功能
@@ -335,8 +336,8 @@

            LoadEventList();

            new TopViewDiv(bodyView, Language.StringByID(StringId.TV)).LoadTopView_FunctionTop(tv, actionRefresh);
            DriverLayer.Control.Ins.SendReadCommand(tv);
            new TopViewDiv(bodyView, Language.StringByID(StringId.TV)).LoadTopView_FunctionTop(function, actionRefresh);
            DriverLayer.Control.Ins.SendReadCommand(function);

        }

@@ -420,7 +421,7 @@
                numberView.AddChidren(btn);
                btn.MouseUpEventHandler = (sender, e) => {
                    btn.IsSelected = false;
                    tv.ControlTV(i);
                    tvTemp.ControlTV(i,function);
                };
                btn.MouseDownEventHandler = (sender, e) => {
                    btn.IsSelected = true;