Merge branch 'Dev-Branch' into wjc

wxr

2022-11-11 b47f91b91bc5371bba0c8801dbd648772ab331fc

 HDL_ON/UI/UI2/FuntionControlView/Light/LightScene/AddLightScene.cs

@@ -641,7 +641,7 @@
                TextColor = CSS_Color.MainBackgroundColor,
                TextAlignment = TextAlignment.Center,
                TextSize = CSS_FontSize.SubheadingFontSize,
                TextID = StringId.Complete
                Text = "执行"
            };
            bottomView.AddChidren(btnComplete);

@@ -652,7 +652,7 @@


            btnComplete.MouseUpEventHandler = (sender, e) => {
                this.Close();
                //this.Close();

                var waitPage = new Loading();
                MainPage.BaseView.AddChidren(waitPage);
@@ -689,9 +689,10 @@
                        Application.RunOnMainThread(() =>
                        {
                            waitPage.Hide();
                            new PublicAssmebly().TipMsgAutoClose("组合控制已执行", true);
                            if (waitPage != null)
                            {
                                backAction(null);
                                //backAction(null);
                                waitPage.RemoveFromParent();
                            }
                        });