2020-12-03-1

陈嘉乐

2020-12-03 0f2e0147e8990e913d16d99bc1b94fb6bc53abd7

 HDL_ON/UI/UI0-Public/PublicAssmebly.cs

@@ -173,7 +173,7 @@
            {
                X = btnCancel.Right,
                Y = btnLine.Y,
                Width = Application.GetRealWidth(135),
                Width = Application.GetRealWidth(137),
                Height = Application.GetRealHeight(43 + 1),
                TextAlignment = TextAlignment.Center,
                //TextColor = CSS_Color.TextualColor,
@@ -276,22 +276,12 @@
            };
            contentView.AddChidren(btnCancel);

            //Button btnBottomLine = new Button()
            //{
            //    X = btnCancel.Right,
            //    Y = btnLine.Bottom,
            //    Height = Application.GetRealHeight(43),
            //    Width = Application.GetRealWidth(1),
            //    BackgroundColor = CSS_Color.DividingLineColor,
            //};
            //contentView.AddChidren(btnBottomLine);

            Button btnConfirm = new Button()
            {
                X = btnCancel.Right,
                Y = btnLine.Y,
                Width = Application.GetRealWidth(135),
                Height = Application.GetRealHeight(43 + 1),
                Height = Application.GetRealHeight(45),
                TextAlignment = TextAlignment.Center,
                //TextColor = CSS_Color.TextualColor,
                TextSize = CSS_FontSize.SubheadingFontSize,
@@ -555,7 +545,7 @@
        /// 场景延时设置弹窗
        /// </summary>
        /// <param name="function"></param>
        public void SetSceneDelayDialog(Function function,Button btn)
        public void SetSceneDelayDialog(Scene  scene,Button btn)
        {
            Button lastButton = new Button();
            int changeDelay = 0;
@@ -638,7 +628,7 @@
                SelectedBackgroundColor = CSS_Color.MainColor,
                X = Application.GetRealWidth(20),
                Y = Application.GetRealHeight(80),
                IsSelected = function.delayText == "30s"
                IsSelected = scene.delayText == "30s"
            };
            optionBaseView.AddChidren(btn1);

@@ -658,7 +648,7 @@
                SelectedBackgroundColor = CSS_Color.MainColor,
                X = Application.GetRealWidth(195),
                Y = Application.GetRealHeight(80),
                IsSelected = function.delayText == "1min"
                IsSelected = scene.delayText == "1min"
            };
            optionBaseView.AddChidren(btn2);

@@ -678,7 +668,7 @@
                SelectedBackgroundColor = CSS_Color.MainColor,
                X = Application.GetRealWidth(20),
                Y = Application.GetRealHeight(140),
                IsSelected = function.delayText == "2min"
                IsSelected = scene.delayText == "2min"
            };
            optionBaseView.AddChidren(btn3);

@@ -698,7 +688,7 @@
                SelectedBackgroundColor = CSS_Color.MainColor,
                X = Application.GetRealWidth(195),
                Y = Application.GetRealHeight(140),
                IsSelected = function.delayText == "5min"
                IsSelected = scene.delayText == "5min"
            };
            optionBaseView.AddChidren(btn4);

@@ -719,8 +709,8 @@
            btnConfrim.MouseUpEventHandler = (sender, e) =>
            {
                dialog.Close();
                function.delay = changeDelay;
                btn.Text = function.delayText;
                scene.delay = changeDelay;
                btn.Text = scene.delayText;
            };
            btn1.MouseUpEventHandler = (sender, e) => {
                btn1.IsSelected = !btn1.IsSelected;