Merge branch 'feature/v2.7_迭代' into feature/V2.7_Google

wxr

2024-09-27 acc8caee31c4be90bd38d1af18136b0e84f6fe94

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

@@ -279,11 +279,6 @@
                        scene.delay = obj;
                        btnSceneDelayInfo.Text = scene.GetDelayText();
                    };
                    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( action ,scene.delay);


@@ -467,13 +462,23 @@
                    };
                    row.AddChidren(btnFunctionDelayInfo);

                    if (Convert.ToInt32(scenefunction.delay) > 0)
                    try
                    {
                        btnFunctionDelayInfo.Text = Language.StringByID(StringId.Delay) + " " + new Scene() { delay = scenefunction.delay }.GetDelayText();
                        int delayTime = 0;
                        int.TryParse(scenefunction.delay, out delayTime);

                        if (!string.IsNullOrEmpty(scenefunction.delay) && delayTime > 0)
                        {
                            btnFunctionDelayInfo.Text = Language.StringByID(StringId.Delay) + " " + new Scene() { delay = scenefunction.delay }.GetDelayText();
                        }
                        else
                        {
                            btnFunctionDelayInfo.Text = Language.StringByID(StringId.NoDelay);
                        }
                    }
                    else
                    catch (Exception ex)
                    {
                        btnFunctionDelayInfo.Text = Language.StringByID(StringId.NoDelay);
                        MainPage.Log("Error", $"场景编辑，转译数据异常：{ex.StackTrace}");
                    }

                    var btnFunctionFloorAndRoom = new Button()