~wxr/OnPro.git - Gitblit

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

			if (!string.IsNullOrEmpty(scenefunction.delay) && 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}");
			}


			@@ -821,13 +831,21 @@
			btnOn.MouseUpEventHandler = (sender, e) =>
			{
			dialog.Close();
			temp = new SceneFunction();
			temp.type = "7";
			temp.status.Add(new SceneFunctionStatus()
			var kv = temp.status.Find((obj) => obj.key == "enable");
			if (kv != null)
			{
			key = "enable",
			value = "true"
			});
			kv.value = "true";
			}
			else
			{
			temp.status.Add(new SceneFunctionStatus()
			{
			key = "enable",
			value = "true",
			});
			}

			var waitPage = new Loading();
			bodyView.AddChidren(waitPage);
			waitPage.Start("");
			@@ -840,6 +858,10 @@
			if (code == "0")
			{
			btnTipText.TextID = StringId.OpenArm;
			}
			else
			{
			IMessageCommon.Current.ShowErrorInfoAlter(code);
			}
			});
			}
			@@ -860,13 +882,21 @@
			btnOff.MouseUpEventHandler = (sender, e) =>
			{
			dialog.Close();
			temp = new SceneFunction();
			temp.type = "7";
			temp.status.Add(new SceneFunctionStatus()

			var kv = temp.status.Find((obj) => obj.key == "enable");
			if (kv != null)
			{
			key = "enable",
			value = "false"
			});
			kv.value = "false";
			}
			else
			{
			temp.status.Add(new SceneFunctionStatus()
			{
			key = "enable",
			value = "false",
			});
			}

			var waitPage = new Loading();
			bodyView.AddChidren(waitPage);
			@@ -880,6 +910,10 @@
			if (code == "0")
			{
			btnTipText.TextID = StringId.Close;
			}
			else
			{
			IMessageCommon.Current.ShowErrorInfoAlter(code);
			}
			});
			}
			@@ -948,11 +982,22 @@
			void LoadEvent_ChangeFunctionList()
			{
			btnAddFunctionTitle.MouseUpEventHandler = (sender, e) => {
			//var sefp =new SceneFunctionListChoosePage(scene,refreshFunctionRowAction);
			var sefp = new SceneTargetTypeChoosePage(scene, refreshFunctionRowAction);
			MainPage.BasePageView.AddChidren(sefp);
			sefp.LoadPage();
			MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
			if (DB_ResidenceData.Instance.HomeGateway.isSupportSceneEnableAutomation)
			{
			//var sefp =new SceneFunctionListChoosePage(scene,refreshFunctionRowAction);
			var sefp = new SceneTargetTypeChoosePage(scene, refreshFunctionRowAction);
			MainPage.BasePageView.AddChidren(sefp);
			sefp.LoadPage();
			MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
			}
			else
			{
			var sefp = new SceneFunctionListChoosePage(scene,refreshFunctionRowAction);
			//var sefp = new SceneTargetTypeChoosePage(scene, refreshFunctionRowAction);
			MainPage.BasePageView.AddChidren(sefp);
			sefp.LoadPage();
			MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
			}
			};
			}

			@@ -995,7 +1040,7 @@
			CropImage.TakePicture((imagePath) =>
			{
			CropImageCallBack(imagePath);
			}, imageName, 4, 3);
			}, imageName, 4, 3,0);

			pictureOptionView.Parent.RemoveFromParent();
			};
			@@ -1006,16 +1051,6 @@
			btnAlbum.MouseUpEventHandler = (sender, e) =>
			{
			btnAlbum.IsSelected = false;
			//var pid = Guid.NewGuid();
			//CropImage.SelectPicture((imagePath) =>
			//{
			// if (imagePath != null)
			// {
			// addSceneImageView.ImagePath = imagePath.ToString();
			// scene.ImagePath = addSceneImageView.ImagePath;
			// MainPage.Log("SelectPicture 裁剪图片返回路径: " + imagePath);
			// }
			//}, pid.ToString(), 4, 3);

			//从相册选择图片裁剪
			var imageName = Guid.NewGuid().ToString();
			@@ -1023,7 +1058,7 @@
			CropImage.SelectPicture((imagePath) =>
			{
			CropImageCallBack(imagePath);
			}, imageName, 4, 3);
			}, imageName, 4, 3,0);


			pictureOptionView.Parent.RemoveFromParent();