20201112

wxr

2020-11-12 a715181089be0d31cd737a5367ffd02690b9d77f

 HDL_ON/UI/UI2/FuntionControlView/Light/RelayPage.cs

@@ -61,9 +61,18 @@
        /// <param name="btnFromFloor">功能楼层信息按钮</param>
        public void LoadPage(Button btnCollectionIcon, Button btnFunctionNameOut, Button btnFromFloorOut)
        {
            btnCollection_Out = btnCollectionIcon;
            btnFunctionName_Out = btnFunctionNameOut;
            btnFromFloor_Out = btnFromFloorOut;
            if (btnCollectionIcon == null)
            {
                btnCollection_Out = new Button();
                btnFunctionName_Out = new Button();
                btnFromFloor_Out = new Button();
            }
            else
            {
                btnCollection_Out = btnCollectionIcon;
                btnFunctionName_Out = btnFunctionNameOut;
                btnFromFloor_Out = btnFromFloorOut;
            }
            bodyView.BackgroundColor = CSS_Color.BackgroundColor;
            //new PublicAssmebly().LoadTopView(bodyView, Language.StringByID(StringId.Lights), light);

@@ -119,12 +128,11 @@
            {
                Gravity = Gravity.CenterHorizontal,
                Y = Application.GetRealHeight(102),
                Width = Application.GetRealWidth(168-40),
                Width = Application.GetRealWidth(168),
                Height = Application.GetRealHeight(288),
                BackgroundColor = CSS_Color.PromptingColor2,
                SelectedBackgroundColor= CSS_Color.AuxiliaryColor1,
                Radius = (uint)Application.GetRealWidth(40),
                IsSelected = light.on_off == "on"
                UnSelectedImagePath = "FunctionIcon/Light/RelayBg.png",
                SelectedImagePath = "FunctionIcon/Light/RelayOnBg.png",
                IsSelected = light.trait_on_off.value.ToString() == "on"
            };
            controlView.AddChidren(btnSwitchIcon);

@@ -136,13 +144,13 @@
                Height = Application.GetMinRealAverage(40),
                UnSelectedImagePath = "Public/PowerClose.png",
                SelectedImagePath = "Public/PowerOpen.png",
                IsSelected = light.on_off == "on"
                IsSelected = light.trait_on_off.value.ToString() == "on"
            };
            controlView.AddChidren(btnSwitch);

            LoadEventList();

            new TopViewDiv(bodyView, Language.StringByID(StringId.Lights)).LoadTopView(light, actionRefresh);
            new TopViewDiv(bodyView, Language.StringByID(StringId.Lights)).LoadTopView_FunctionTop(light, actionRefresh);

        }
    }