20201221-3

wei

2020-12-21 1887ea937010ff8caba39622e8246a2802ca02c5

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

@@ -521,7 +521,6 @@
                    Tag = item + "_View",
                    Y = index % 2 == 1 ? lastY2 : lastY1
                };
                MainPage.Log($"Load FunctionView Tag = {item}");
                //高度稍高的view
                if (specialList.Contains(index))
                {
@@ -590,7 +589,7 @@

                        btnLightPower.MouseUpEventHandler = (sender, e) =>
                        {
                            LoadEvent_SwitchFunction(btnLightPower, item);
                            LoadEvent_SwitchFunction(btnLightPower, item, functionView);
                        };
                        functionPageTitleId = StringId.Lights;
                      
@@ -615,7 +614,7 @@
                        functionView.AddChidren(btnAcPower);
                        btnAcPower.MouseUpEventHandler = (sender, e) =>
                        {
                            LoadEvent_SwitchFunction(btnAcPower, item);
                            LoadEvent_SwitchFunction(btnAcPower, item, functionView);
                        };
                        functionPageTitleId = StringId.AC;
                        #endregion
@@ -650,7 +649,7 @@
                            IsSelected = DB_ResidenceData.Instance.GlobalCurtainStatus,
                        };
                        functionView.AddChidren(btnOpen);
                        LoadEvent_CurtainSwitch(btnClose, btnOpen);
                        LoadEvent_CurtainSwitch(btnClose, btnOpen, functionView);

                        functionPageTitleId = StringId.Curtain;
                        #endregion
@@ -674,7 +673,7 @@
                        functionView.AddChidren(btnFhPower);
                        btnFhPower.MouseUpEventHandler = (sender, e) =>
                        {
                            LoadEvent_SwitchFunction(btnFhPower, item);
                            LoadEvent_SwitchFunction(btnFhPower, item, functionView);
                        };
                        functionPageTitleId = StringId.FloorHeating;
                        #endregion
@@ -701,7 +700,7 @@
                        functionView.AddChidren(btnElectricPower);
                        btnElectricPower.MouseUpEventHandler = (sender, e) =>
                        {
                            LoadEvent_SwitchFunction(btnElectricPower, item);
                            LoadEvent_SwitchFunction(btnElectricPower, item, functionView);
                        };
                        functionPageTitleId = StringId.Electric;
                        #endregion
@@ -921,7 +920,7 @@
                        Text = floor.roomName,
                        TextSize = CSS_FontSize.SubheadingFontSize,
                        IsSelected = floor.roomId == DB_ResidenceData.Instance.ClassificationChooseFloor.roomId,
                        IsMoreLines = true,
                        //IsMoreLines = true,
                    };
                    contentView.AddChidren(btnHomeName);