20201223-6

wei

2020-12-23 263401d40b2d9d2c1b36a24f33d45c5cb7192518

 HDL_ON/UI/UI0-Public/PublicAssmebly.cs

@@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
using System.Text.RegularExpressions;
using System.Threading;
using HDL_ON.Entity;
using HDL_ON.UI.CSS;
@@ -28,15 +29,22 @@

            btnConfirm.MouseUpEventHandler += (sender, e) =>
            {
                //btnConfirm.IsSelected = false;
                if (string.IsNullOrEmpty(editText.Text.Trim()) || list.Contains(editText.Text.Trim()))
                var text = editText.Text.Trim();
                Regex regtest = new Regex(@"\p{Cs}");
                Match match = regtest.Match(text);
                if (match.Success)
                {
                    if (titleId == StringId.ModifyMemberNickname)
                    {
                        return;
                    }
                    HDLCommon.Current.ShowAlert(Language.StringByID(StringId.CannotEnterSpecialCharacters));
                    return;
                }
                if (string.IsNullOrEmpty(text) || list.Contains(text))
                {
                    //if (titleId == StringId.ModifyMemberNickname)
                    //{
                    //    return;
                    //}
                    string tipMsgString = "";
                    if (string.IsNullOrEmpty(editText.Text.Trim()))
                    if (string.IsNullOrEmpty(text))
                    {
                        tipMsgString = Language.StringByID(errorId_IsNullOrEmpty);
                    }
@@ -58,7 +66,7 @@
                }


                callBackAction(editText.Text.Trim());
                callBackAction(text);
                dialog.Close();
            };
        }
@@ -120,10 +128,29 @@
                Text = editParater,
                TextColor = CSS_Color.FirstLevelTitleColor,
                TextSize = CSS_FontSize.TextFontSize,
                SecureTextEntry = encryption,
                //SecureTextEntry = encryption,
                //TextAlignment = TextAlignment.CenterLeft ,
            };
            editView.AddChidren(etParater);
            if(encryption)
            {
                etParater.SecureTextEntry = encryption;
            }

            Button btnClear = new Button()
            {
                X = Application.GetRealWidth(218-25),
                Gravity = Gravity.CenterVertical,
                Width = Application.GetRealWidth(24),
                Height = Application.GetRealWidth(24),
                UnSelectedImagePath = "Public/ClearIcon.png",
            };
            editView.AddChidren(btnClear);

            btnClear.MouseUpEventHandler = (sender, e) =>
            {
                etParater.Text = "";
            };

            etParater.TextChangeEventHandler = (sender, e) =>
            {
@@ -188,17 +215,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 +229,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 +270,7 @@
                TextColor = CSS_Color.TextualColor,
                TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
                TextID = msgId,
                IsMoreLines = true,
            };
            contentView.AddChidren(btnMsg);

@@ -368,6 +389,7 @@
                TextSize = CSS_FontSize.TextFontSize,
                TextColor = isWhite ? CSS_Color.FirstLevelTitleColor : CSS_Color.MainBackgroundColor,
                Text = msg,
                IsMoreLines = true,
            };
            frame.AddChidren(btnTipMsg);

@@ -392,7 +414,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 +455,7 @@
                TextColor = CSS_Color.TextualColor,
                TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
                TextID = msgId,
                IsMoreLines = true,
            };
            contentView.AddChidren(btnMsg);

@@ -466,6 +489,7 @@
            btnConfirm.MouseUpEventHandler += (sender, e) =>
            {
                btnConfirm.IsSelected = false;
                action?.Invoke();
                dialog.Close();
            };

@@ -545,12 +569,10 @@
        /// 场景延时设置弹窗
        /// </summary>
        /// <param name="function"></param>
        public void SetSceneDelayDialog(Scene  scene,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,
@@ -605,11 +627,12 @@

            var btnConfrim = new Button()
            {
                Width = Application.GetRealWidth(320),
                X = Application.GetRealWidth(160),
                Width = Application.GetRealWidth(160),
                TextAlignment = TextAlignment.CenterRight,
                TextColor = CSS_Color.MainColor,
                TextSize = CSS_FontSize.TextFontSize,
                TextID = StringId.Complete,
                TextID = StringId.Confirm,
            };
            topView.AddChidren(btnConfrim);

@@ -628,7 +651,7 @@
                SelectedBackgroundColor = CSS_Color.MainColor,
                X = Application.GetRealWidth(20),
                Y = Application.GetRealHeight(80),
                IsSelected = scene.delayText == "30s"
                IsSelected = changeDelay == "30"
            };
            optionBaseView.AddChidren(btn1);

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

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

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

@@ -708,9 +731,8 @@
            };
            btnConfrim.MouseUpEventHandler = (sender, e) =>
            {
                action(changeDelay);
                dialog.Close();
                scene.delay = changeDelay;
                btn.Text = scene.delayText;
            };
            btn1.MouseUpEventHandler = (sender, e) => {
                btn1.IsSelected = !btn1.IsSelected;
@@ -719,11 +741,11 @@
                btn4.IsSelected = false;
                if(btn1.IsSelected)
                {
                    changeDelay = 30;
                    changeDelay = "30";
                }
                else
                {
                    changeDelay = 0;
                    changeDelay = "0";
                }       
            };
            btn2.MouseUpEventHandler = (sender, e) => {
@@ -733,11 +755,11 @@
                btn4.IsSelected = false;
                if (btn2.IsSelected)
                {
                    changeDelay = 60;
                    changeDelay = "60";
                }
                else
                {
                    changeDelay = 0;
                    changeDelay = "0";
                }
            };
            btn3.MouseUpEventHandler = (sender, e) => {
@@ -747,11 +769,11 @@
                btn4.IsSelected = false;
                if (btn3.IsSelected)
                {
                    changeDelay = 120;
                    changeDelay = "120";
                }
                else
                {
                    changeDelay = 0;
                    changeDelay = "0";
                }
            };
            btn4.MouseUpEventHandler = (sender, e) => {
@@ -761,11 +783,11 @@
                btn1.IsSelected = false;
                if (btn4.IsSelected)
                {
                    changeDelay = 300;
                    changeDelay = "300";
                }
                else
                {
                    changeDelay = 0;
                    changeDelay = "0";
                }
            };