From c00da77d00a479fa5d022346a6d9075f90a5c087 Mon Sep 17 00:00:00 2001
From: wxr <wxr@hdlchina.com.cn>
Date: 星期六, 14 九月 2024 10:05:34 +0800
Subject: [PATCH] 退出登录时间调整，新风，音乐
---
HDL_ON/UI/UI2/3-Intelligence/Scene/SceneEditPage.cs | 79 ++++++++++++++++++++++++++-------------
1 files changed, 52 insertions(+), 27 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneEditPage.cs b/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneEditPage.cs
index 40589b1..a5020be 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneEditPage.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneEditPage.cs
@@ -821,13 +821,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 +848,10 @@
if (code == "0")
{
btnTipText.TextID = StringId.OpenArm;
+ }
+ else
+ {
+ IMessageCommon.Current.ShowErrorInfoAlter(code);
}
});
}
@@ -860,13 +872,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 +900,10 @@
if (code == "0")
{
btnTipText.TextID = StringId.Close;
+ }
+ else
+ {
+ IMessageCommon.Current.ShowErrorInfoAlter(code);
}
});
}
@@ -948,11 +972,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 +1030,7 @@
CropImage.TakePicture((imagePath) =>
{
CropImageCallBack(imagePath);
- }, imageName, 4, 3);
+ }, imageName, 4, 3,0);
pictureOptionView.Parent.RemoveFromParent();
};
@@ -1006,16 +1041,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 +1048,7 @@
CropImage.SelectPicture((imagePath) =>
{
CropImageCallBack(imagePath);
- }, imageName, 4, 3);
+ }, imageName, 4, 3,0);
pictureOptionView.Parent.RemoveFromParent();
--
Gitblit v1.8.0