Merge branch 'NewFilePath' into CJL

JLChen

2020-12-16 0e7881aa010ff350d04895a0687ffb7d5ca46168

 HDL_ON/UI/UI0-Public/PublicAssmebly.cs

@@ -541,12 +541,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,
@@ -624,7 +622,7 @@
                SelectedBackgroundColor = CSS_Color.MainColor,
                X = Application.GetRealWidth(20),
                Y = Application.GetRealHeight(80),
                IsSelected = scene.delayText == "30s"
                IsSelected = changeDelay == "30"
            };
            optionBaseView.AddChidren(btn1);

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

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

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

@@ -704,9 +702,8 @@
            };
            btnConfrim.MouseUpEventHandler = (sender, e) =>
            {
                action(changeDelay);
                dialog.Close();
                scene.delay = changeDelay;
                btn.Text = scene.delayText;
            };
            btn1.MouseUpEventHandler = (sender, e) => {
                btn1.IsSelected = !btn1.IsSelected;
@@ -715,11 +712,11 @@
                btn4.IsSelected = false;
                if(btn1.IsSelected)
                {
                    changeDelay = 30;
                    changeDelay = "30";
                }
                else
                {
                    changeDelay = 0;
                    changeDelay = "0";
                }       
            };
            btn2.MouseUpEventHandler = (sender, e) => {
@@ -729,11 +726,11 @@
                btn4.IsSelected = false;
                if (btn2.IsSelected)
                {
                    changeDelay = 60;
                    changeDelay = "60";
                }
                else
                {
                    changeDelay = 0;
                    changeDelay = "0";
                }
            };
            btn3.MouseUpEventHandler = (sender, e) => {
@@ -743,11 +740,11 @@
                btn4.IsSelected = false;
                if (btn3.IsSelected)
                {
                    changeDelay = 120;
                    changeDelay = "120";
                }
                else
                {
                    changeDelay = 0;
                    changeDelay = "0";
                }
            };
            btn4.MouseUpEventHandler = (sender, e) => {
@@ -757,11 +754,11 @@
                btn1.IsSelected = false;
                if (btn4.IsSelected)
                {
                    changeDelay = 300;
                    changeDelay = "300";
                }
                else
                {
                    changeDelay = 0;
                    changeDelay = "0";
                }
            };