JLChen
2020-12-16 d724f7f21c5cc8c5dd5aa0cf7345a62a662eb2bf
HDL_ON/UI/UI0-Public/PublicAssmebly.cs
@@ -188,17 +188,10 @@
            dialog.Show();
            //btnCancel.MouseDownEventHandler += (sender, e) => {
            //    btnCancel.IsSelected = true;
            //};
            btnCancel.MouseUpEventHandler += (sender, e) =>
            {
                //btnCancel.IsSelected = false;
                dialog.Close();
            };
            //btnConfirm.MouseDownEventHandler += (sender, e) => {
            //    btnConfirm.IsSelected = true;
            //};
            EditParaterEvent(btnConfirm, errorId_IsNullOrEmpty, errorId_ContainsPar, baseList, etParater, callBackAction,
                contentView, btnLine, btnCancel, editView, dialog, titleId);
        }
@@ -209,7 +202,7 @@
        /// <param name="titleId"></param>
        /// <param name="msgId"></param>
        /// <param name="callBackAction"></param>
        public void TipMsg(int titleId, int msgId, Action callBackAction)
        public void TipOptionMsg(int titleId, int msgId, Action callBackAction)
        {
            Dialog dialog = new Dialog()
            {
@@ -250,6 +243,7 @@
                TextColor = CSS_Color.TextualColor,
                TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
                TextID = msgId,
                IsMoreLines = true,
            };
            contentView.AddChidren(btnMsg);
@@ -392,7 +386,7 @@
        /// </summary>
        /// <param name="titleId"></param>
        /// <param name="msgId"></param>
        public void TipMsg(int titleId, int msgId)
        public void TipMsg(int titleId, int msgId,Action action = null)
        {
            Dialog dialog = new Dialog()
            {
@@ -433,6 +427,7 @@
                TextColor = CSS_Color.TextualColor,
                TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
                TextID = msgId,
                IsMoreLines = true,
            };
            contentView.AddChidren(btnMsg);
@@ -466,6 +461,7 @@
            btnConfirm.MouseUpEventHandler += (sender, e) =>
            {
                btnConfirm.IsSelected = false;
                action?.Invoke();
                dialog.Close();
            };
@@ -545,12 +541,10 @@
        /// 场景延时设置弹窗
        /// </summary>
        /// <param name="function"></param>
        public void SetSceneDelayDialog(Function function,Button btn)
        public void SetSceneDelayDialog(Action<string> action,string changeDelay)
        {
            Button lastButton = new Button();
            int changeDelay = 0;
            Dialog dialog = new Dialog();
            var pView = new FrameLayout()
            {
                BackgroundColor = CSS_Color.DialogTransparentColor1,
@@ -628,7 +622,7 @@
                SelectedBackgroundColor = CSS_Color.MainColor,
                X = Application.GetRealWidth(20),
                Y = Application.GetRealHeight(80),
                IsSelected = function.delayText == "30s"
                IsSelected = changeDelay == "30"
            };
            optionBaseView.AddChidren(btn1);
@@ -648,7 +642,7 @@
                SelectedBackgroundColor = CSS_Color.MainColor,
                X = Application.GetRealWidth(195),
                Y = Application.GetRealHeight(80),
                IsSelected = function.delayText == "1min"
                IsSelected = changeDelay == "60"
            };
            optionBaseView.AddChidren(btn2);
@@ -668,7 +662,7 @@
                SelectedBackgroundColor = CSS_Color.MainColor,
                X = Application.GetRealWidth(20),
                Y = Application.GetRealHeight(140),
                IsSelected = function.delayText == "2min"
                IsSelected = changeDelay == "120"
            };
            optionBaseView.AddChidren(btn3);
@@ -688,7 +682,7 @@
                SelectedBackgroundColor = CSS_Color.MainColor,
                X = Application.GetRealWidth(195),
                Y = Application.GetRealHeight(140),
                IsSelected = function.delayText == "5min"
                IsSelected = changeDelay == "300"
            };
            optionBaseView.AddChidren(btn4);
@@ -708,9 +702,8 @@
            };
            btnConfrim.MouseUpEventHandler = (sender, e) =>
            {
                action(changeDelay);
                dialog.Close();
                function.delay = changeDelay;
                btn.Text = function.delayText;
            };
            btn1.MouseUpEventHandler = (sender, e) => {
                btn1.IsSelected = !btn1.IsSelected;
@@ -719,11 +712,11 @@
                btn4.IsSelected = false;
                if(btn1.IsSelected)
                {
                    changeDelay = 30;
                    changeDelay = "30";
                }
                else
                {
                    changeDelay = 0;
                    changeDelay = "0";
                }       
            };
            btn2.MouseUpEventHandler = (sender, e) => {
@@ -733,11 +726,11 @@
                btn4.IsSelected = false;
                if (btn2.IsSelected)
                {
                    changeDelay = 60;
                    changeDelay = "60";
                }
                else
                {
                    changeDelay = 0;
                    changeDelay = "0";
                }
            };
            btn3.MouseUpEventHandler = (sender, e) => {
@@ -747,11 +740,11 @@
                btn4.IsSelected = false;
                if (btn3.IsSelected)
                {
                    changeDelay = 120;
                    changeDelay = "120";
                }
                else
                {
                    changeDelay = 0;
                    changeDelay = "0";
                }
            };
            btn4.MouseUpEventHandler = (sender, e) => {
@@ -761,11 +754,11 @@
                btn1.IsSelected = false;
                if (btn4.IsSelected)
                {
                    changeDelay = 300;
                    changeDelay = "300";
                }
                else
                {
                    changeDelay = 0;
                    changeDelay = "0";
                }
            };