From 09dfbfd9b77ec887c17b10f15799a1d3f56e4e17 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期二, 15 十二月 2020 12:04:42 +0800
Subject: [PATCH] 2020-12-15-1
---
HDL_ON/UI/UI2/3-Intelligence/Scene/SceneEditPage.cs | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneEditPage.cs b/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneEditPage.cs
index 62844ce..cb146e7 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneEditPage.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneEditPage.cs
@@ -245,7 +245,7 @@
#endregion
#region 鍦烘櫙寤舵椂row
- if (DB_ResidenceData.residenceData.GatewayType == 1)
+ if (DB_ResidenceData.Instance.GatewayType == 1)
{
FrameLayout sceneDelayRow = new FrameLayout()
{
@@ -524,14 +524,14 @@
{
case FunctionType.AC:
sceneFunctionInfo += sceneFunction.localFunction.attributes.Find((obj) => obj.key == "mode").GetCurValueText();
- sceneFunctionInfo += " " + sceneFunction.localFunction.attributes.Find((obj) => obj.key == "set_temperature").curValue.ToString() +
- sceneFunction.localFunction.attributes.Find((obj) => obj.key == "set_temperature").uintString;
+ sceneFunctionInfo += " " + sceneFunction.localFunction.attributes.Find((obj) => obj.key == "set_temp").curValue.ToString() +
+ sceneFunction.localFunction.attributes.Find((obj) => obj.key == "set_temp").uintString;
sceneFunctionInfo += sceneFunction.localFunction.attributes.Find((obj) => obj.key == "fan").GetCurValueText();
break;
case FunctionType.FloorHeating:
sceneFunctionInfo += sceneFunction.localFunction.attributes.Find((obj) => obj.key == "mode").GetCurValueText();
- sceneFunctionInfo += " " + sceneFunction.localFunction.attributes.Find((obj) => obj.key == "set_temperature").curValue.ToString() +
- sceneFunction.localFunction.attributes.Find((obj) => obj.key == "set_temperature").uintString;
+ sceneFunctionInfo += " " + sceneFunction.localFunction.attributes.Find((obj) => obj.key == "set_temp").curValue.ToString() +
+ sceneFunction.localFunction.attributes.Find((obj) => obj.key == "set_temp").uintString;
break;
case FunctionType.Dimmer:
perTrait = sceneFunction.localFunction.attributes.Find((obj) => obj.key == "brightness");
@@ -870,7 +870,7 @@
}.Show(bodyView);
return;
}
- foreach (var tempRoom in DB_ResidenceData.functionList.scenes)
+ foreach (var tempRoom in FunctionList.List.scenes)
{
if (scene.name == tempRoom.name)
{
@@ -879,7 +879,7 @@
}
}
scene.SaveSceneData(true);
- DB_ResidenceData.functionList.scenes.Add(scene);
+ FunctionList.List.scenes.Add(scene);
backAction();
this.RemoveFromParent();
}
@@ -887,11 +887,11 @@
{
Action action = () =>
{
- DB_ResidenceData.functionList.DeleteScene(scene,true);
+ FunctionList.List.DeleteScene(scene,true);
backAction();
this.RemoveFromParent();
};
- new PublicAssmebly().TipMsg(StringId.Tip, StringId.DeleteSceneTip, action);
+ new PublicAssmebly().TipOptionMsg(StringId.Tip, StringId.DeleteSceneTip, action);
};
};
}
@@ -925,7 +925,7 @@
EventHandler<MouseEventArgs> eventHandler = (sender, e) =>
{
List<string> sceneNameList = new List<string>();
- foreach (var tempScene in DB_ResidenceData.functionList.scenes)
+ foreach (var tempScene in FunctionList.List.scenes)
{
sceneNameList.Add(tempScene.name);
}
@@ -982,7 +982,7 @@
System.IO.File.Delete(imageView.ImagePath);
}
//閲嶅懡鍚嶄繚瀛�
- Common.FileUtlis.Files.WriteFileByBytes(imageUrl, imageBytes);
+ ImageUtlis.Current.WriteFileByBytes(imageUrl, imageBytes);
imageView.ImagePath = null;
imageView.ImageBytes = imageBytes;
//涓婁紶鎴愬姛
--
Gitblit v1.8.0