~wxr/OnPro.git - Gitblit

			@@ -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,7 @@
			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);
			@@ -565,6 +571,31 @@
			}
			}

			var perSetVolume = sceneFunction.status.Find((obj) => obj.key == FunctionAttributeKey.SetVolume);
			if (perSetVolume != null)
			{
			sceneFunctionInfo += " " + perSetVolume.value ;
			}

			var perSignal = sceneFunction.status.Find((obj) => obj.key == FunctionAttributeKey.Signal);
			if (perSignal != null)
			{
			var p = new HDL_ON.UI.UI2.Intelligence.Automation.PublicInterface();
			string key = p.GetKey(p.GetHisenseSignalSourceDic(), perSignal.value);
			sceneFunctionInfo += " " + key;
			}

			var perVolume = sceneFunction.status.Find((obj) => obj.key == FunctionAttributeKey.Volume);
			if (perVolume != null)
			{
			sceneFunctionInfo += " " + perVolume.value;
			}

			var perSongName = sceneFunction.status.Find((obj) => obj.key == FunctionAttributeKey.SongName);
			if (perSongName != null)
			{
			sceneFunctionInfo += " " + perSongName.value;
			}
			return sceneFunctionInfo;
			}