~wxr/OnPro.git - Gitblit

			@@ -32,7 +32,7 @@

			bodyView = this;
			scene = s;
			sceneFunction = fc.localFunction.ConvertSceneFunction();
			sceneFunction = fc;//.localFunction.ConvertSceneFunction();
			foreach (var ll in sceneFunction.status)
			{
			try
			@@ -229,6 +229,7 @@
			{
			sceneFunction.status.Clear();
			sceneFunction.status.Add(new SceneFunctionStatus() { key = FunctionAttributeKey.OnOff, value = "off" });
			sceneFunction.status.Add(new SceneFunctionStatus() { key = FunctionAttributeKey.Delay, value = sceneFunction.delay });
			}
			}
			}
			@@ -238,16 +239,6 @@
			{
			if (temp != null)
			{
			//temp.delay = sceneFunction.delay;
			//foreach (var attr in sceneFunction.status)
			//{
			// var keva = temp.status.Find((obj) => obj.key == attr.key);
			// if (keva != null)
			// {
			// keva.value = attr.value;
			// }
			//}
			//temp = sceneFunction;
			scene.functions.Remove(temp);
			}
			//else
			@@ -292,7 +283,14 @@

			void UpdataFunctionRow()
			{
			contentView.RemoveAll();
			try
			{
			contentView.RemoveAll();
			}
			catch (Exception ex)
			{
			MainPage.Log(ex.Message);
			}
			for (var i = 0; i < functionRowList.Count; i++)
			{
			try
			@@ -304,37 +302,39 @@
			{
			if (view.Tag != null)
			{
			if (view.Tag.ToString() == FunctionAttributeKey.OnOff)
			if (view.Tag.ToString() == FunctionAttributeKey.OnOff \|\| view.Tag.ToString() == "delay")
			{
			contentView.AddChidren(view);

			}
			if (isOnStatus)
			else
			{
			if (view.Tag.ToString() != FunctionAttributeKey.OnOff)
			if (isOnStatus)
			{
			if (isColorful && sceneFunction.localFunction.spk == SPK.LightRGB)
			if (view.Tag.ToString() != FunctionAttributeKey.OnOff)
			{
			if (view.Tag.ToString() != FunctionAttributeKey.Colorful)
			if (isColorful && sceneFunction.localFunction.spk == SPK.LightRGB)
			{
			view.RemoveFromParent();
			if (view.Tag.ToString() != FunctionAttributeKey.Colorful)
			{
			view.RemoveFromParent();
			}
			else
			{
			contentView.AddChidren(view);
			}
			}
			else
			{
			contentView.AddChidren(view);
			}
			}
			else
			{
			contentView.AddChidren(view);
			}
			}
			}
			else
			{
			if (view.Tag.ToString() != FunctionAttributeKey.OnOff)
			else
			{
			view.RemoveFromParent();
			if (view.Tag.ToString() != FunctionAttributeKey.OnOff && view.Tag.ToString() != "delay")
			{
			view.RemoveFromParent();
			}
			}
			}
			}
			@@ -674,43 +674,6 @@
			btnFunctionName.MouseUpEventHandler = (sender, e) =>
			{
			LoadEditDialog_OnOff(sceneStatus, btnFunctionText);
			//var colorfulModePage = new SetSceneRgbColorfulModePage();
			//colorfulModePage.backAction = (selectedSerise,status) => {
			// if (selectedSerise == null)
			// {
			// if (status == "on")
			// {
			// isColorful = true;
			// }
			// else
			// {
			// isColorful = false;
			// }
			// }
			// else
			// {
			// isColorful = true;
			// rgbColorful = selectedSerise.ConvertSceneFunction();
			// }
			// if (isColorful)
			// {
			// btnFunctionText.TextID = StringId.On;
			// if (selectedSerise != null)
			// {
			// btnFunctionText.Text = selectedSerise.name;
			// }
			// }
			// else
			// {
			// btnFunctionText.TextID = StringId.OFF;
			// }
			// UpdataFunctionRow();
			//};
			//MainPage.BasePageView.AddChidren(colorfulModePage);
			//colorfulModePage.LoadPage(sceneFunction.localFunction.sid.Substring(0,16));
			//MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;


			};

			#endregion