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/Entity/Function/Function.cs | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/HDL_ON/Entity/Function/Function.cs b/HDL_ON/Entity/Function/Function.cs
index 7559473..578e86f 100644
--- a/HDL_ON/Entity/Function/Function.cs
+++ b/HDL_ON/Entity/Function/Function.cs
@@ -252,7 +252,7 @@
string roomNameList = "";
foreach (var roomId in roomIds)
{
- var findRoom = DB_ResidenceData.residenceData.Rooms.Find(obj => obj.roomId == roomId);
+ var findRoom = SpatialInfo.CurrentSpatial.RoomList.Find(obj => obj.roomId == roomId);
if (findRoom == null)
{
continue;
@@ -292,7 +292,7 @@
if (pack.Code == DAL.Server.StateCode.SUCCESS)
{
var ssd = System.Text.Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(this));
- FileUtils.WriteFileByBytes(savePath, ssd);
+ Common.FileUtlis.Files.WriteFileByBytes(savePath, ssd);
}
else
{
@@ -302,7 +302,7 @@
else
{
var ssd = System.Text.Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(this));
- FileUtils.WriteFileByBytes(savePath, ssd);
+ Common.FileUtlis.Files.WriteFileByBytes(savePath, ssd);
}
}
@@ -317,6 +317,7 @@
foreach (var attr in attributes)
{
sFunc.status.Add(new SceneFunctionStatus() { key = attr.key, value = attr.curValue.ToString() });
+ sFunc.sid = this.sid;
}
return sFunc;
}
@@ -486,7 +487,7 @@
switch (key)
{
case "temperature":
- case "set_temperature":
+ case "set_temp":
us = "掳C";
break;
case "percent":
@@ -526,7 +527,7 @@
text = Language.StringByID(StringId.FanSpeed);
break;
case "temperature":
- case "set_temperature":
+ case "set_temp":
text = Language.StringByID(StringId.Temp);
break;
case "delay":
@@ -589,7 +590,7 @@
text = value == "on" ? Language.StringByID(StringId.On) : Language.StringByID(StringId.OFF);
break;
case "temperature":
- case "set_temperature":
+ case "set_temp":
case "brightness":
case "percent":
if (value == "")
@@ -774,6 +775,10 @@
/// 鐧惧垎姣�
/// </summary>
public const string Percent = "percent";
+ /// <summary>
+ /// 瀹ゅ唴娓╁害
+ /// </summary>
+ public const string IndoorTemp = "room_temp";
}
/// <summary>
/// 璁惧鍔熻兘oid
--
Gitblit v1.8.0