Merge remote-tracking branch 'origin/NewFilePath' into WJC

陈嘉乐

2021-01-11 1026814d931de92f0da5f15a58870565a94100e0

 HDL_ON/UI/UI2/3-Intelligence/Scene/SceneEditPage.cs

@@ -284,7 +284,12 @@
                        btnSceneDelayInfo.Text = FunctionList.List.GetDelayText(obj);
                        scene.EditScene();
                    };
                    new PublicAssmebly().SetSceneDelayDialog(action,scene.delay);
                    Dictionary<string, string> items = new Dictionary<string, string>();
                    items.Add("30", "30s");
                    items.Add("60", "1min");
                    items.Add("120", "2min");
                    items.Add("300", "5min");
                    new PublicAssmebly().SetSceneDelayDialog(items,action,scene.delay);
                };

                contentView.AddChidren(new Button()
@@ -394,6 +399,7 @@
                        {
                            LoadFunctionRow();
                            waitPage.Hide();
                            waitPage.RemoveFromParent();
                        });
                    }
                    else
@@ -407,6 +413,7 @@
                    Application.RunOnMainThread(() =>
                    {
                        waitPage.Hide();
                        waitPage.RemoveFromParent();
                    });
                }
            }).Start();