数据结构优化修改

wei

2021-03-08 37c315988c2dc11e4f477233f7a9f87d57bb61aa

 HDL_ON/UI/UI2/1-HomePage/HomePage.cs

@@ -459,7 +459,6 @@
        /// </summary>
        void LoadDeviceFunctionControlZone()
        {
         
            #region ContextView
            deviceFunctionView.RemoveAll();
            functionViews.Clear();
@@ -769,7 +768,7 @@
                    };
                    view.AddChidren(btnCurtainOpen);

                    LoadEvent_ControlCurtain(function as Curtain, btnCurtainClose, btnCurtainOpen);
                    LoadEvent_ControlCurtain(function, btnCurtainClose, btnCurtainOpen);
                }

                else if (function.spk == SPK.ElectricTV)
@@ -785,7 +784,7 @@
                        UnSelectedImagePath = "Public/PowerClose.png",
                    };
                    view.AddChidren(btnPower);
                    LoadEvent_ControlTV(function as TV, btnPower);
                    LoadEvent_ControlTV(function, btnPower);
                }

                else if (function.spk == SPK.MusicStandard)
@@ -885,7 +884,7 @@
                            #region 灯光 Light
                            btnIcon.UnSelectedImagePath = "FunctionIcon/Light/LightIcon.png";
                            btnIcon.SelectedImagePath = "FunctionIcon/Light/LightOnIcon.png";
                            UpdataFunctionStates(function as Light);
                            UpdataFunctionStates(function);
                            #endregion
                            break;
                        case FunctionCategory.AC:
@@ -948,6 +947,7 @@
                    function.CollectFunction();
                };


                var skipControlPageEvent = new PublicAssmebly().LoadEvent_SkipFunctionControlPage(function, btnCollection, btnName, btnZone);
                view.MouseUpEventHandler = skipControlPageEvent;
                btnName.MouseUpEventHandler = skipControlPageEvent;