20210303-1

wei

2021-03-03 d4811b7d34b45ff6b21b97f11da128b5572ec526

 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()
@@ -373,32 +378,42 @@

            var waitPage = new Loading();
            new Thread(() => {
                Application.RunOnMainThread(() => {
                    bodyView.AddChidren(waitPage);
                    waitPage.Start(Language.StringByID(StringId.PleaseWait));
                });
                var pm = new HttpServerRequest();
                var pack = pm.GetSceneInfo(scene.userSceneId);
                if (pack.Code == StateCode.SUCCESS)
                try
                {
                    var sceneList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Scene>>(pack.Data.ToString());
                    var tempScene = sceneList.Find((obj) => obj.userSceneId == scene.userSceneId);
                    if(tempScene!= null)
                    {
                        scene.functions = tempScene.functions;
                    }
                    Application.RunOnMainThread(() =>
                    {
                        LoadFunctionRow();
                        waitPage.Hide();
                        bodyView.AddChidren(waitPage);
                        waitPage.Start(Language.StringByID(StringId.PleaseWait));
                    });
                    var pm = new HttpServerRequest();
                    var pack = pm.GetSceneInfo(scene.userSceneId);
                    if (pack.Code == StateCode.SUCCESS)
                    {
                        var sceneList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Scene>>(pack.Data.ToString());
                        var tempScene = sceneList.Find((obj) => obj.userSceneId == scene.userSceneId);
                        if (tempScene != null)
                        {
                            scene.functions = tempScene.functions;
                        }
                        Application.RunOnMainThread(() =>
                        {
                            LoadFunctionRow();
                            waitPage.Hide();
                            waitPage.RemoveFromParent();
                        });
                    }
                    else
                    {
                        IMessageCommon.Current.ShowErrorInfoAlter(pack.Code);
                    }
                }
                else
                catch { }
                finally
                {
                    Application.RunOnMainThread(() =>
                    {
                        waitPage.Hide();
                        IMessageCommon.Current.ShowErrorInfoAlter(pack.Code);
                        waitPage.RemoveFromParent();
                    });
                }
            }).Start();
@@ -415,7 +430,8 @@
                var scenefunction = scene.functions[i];
                if (scenefunction.localFunction == null)
                {
                    scene.functions.Remove(scenefunction);       
                    scene.functions.Remove(scenefunction);
                    continue;
                }
                i++;
                var row = new RowLayout()