2.1.2

wxr

2023-08-18 3fcb73db484d2bed5ee993702913a7eaea68068c

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

@@ -468,10 +468,16 @@

                EventHandler<MouseEventArgs> skipEvent= (sender, e) =>
                {
                    var ssf = new SceneFunctionInfoEditPage(scene, scenefunction.localFunction.ConvertSceneFunction(), refreshFunctionRowAction);
                    MainPage.BasePageView.AddChidren(ssf);
                    ssf.LoadPage();
                    MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
                    try
                    {
                        var ssf = new SceneFunctionInfoEditPage(scene, scenefunction.localFunction.ConvertSceneFunction(), refreshFunctionRowAction);
                        MainPage.BasePageView.AddChidren(ssf);
                        ssf.LoadPage();
                        MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
                    }catch(Exception ex)
                    {
                        MainPage.Log($"load SceneFunctionInfoEditPage error : {ex.Message}");
                    }
                };

                btnFunctionName.MouseUpEventHandler = skipEvent;
@@ -542,7 +548,27 @@
            var perAngle = sceneFunction.status.Find((obj) => obj.key == FunctionAttributeKey.Angle);
            if (perAngle != null)
            {
                sceneFunctionInfo += " "+ perState.value + "°";
                sceneFunctionInfo += " "+ perAngle.value + "°";
            }

            var perColorful = sceneFunction.status.Find((obj) => obj.key == FunctionAttributeKey.Colorful);
            if(perColorful != null)
            {
                if (perColorful.value == "on")
                {
                    sceneFunctionInfo += " " + Language.StringByID(StringId.HorseRaceLamp);
                }
                else
                {
                    if (sceneFunction.localFunction.spk == SPK.GroupControl)
                    {
                        sceneFunctionInfo += " " + Language.StringByID(StringId.Close) + " " + Language.StringByID(StringId.HorseRaceLamp);
                    }
                    else
                    {
                        sceneFunctionInfo = Language.StringByID(StringId.Close) + " " + Language.StringByID(StringId.HorseRaceLamp);
                    }
                }
            }

            return sceneFunctionInfo;