From 20e0fb92d25047fabd2dc418597c0ff9b595b07c Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期一, 21 十二月 2020 19:35:33 +0800
Subject: [PATCH] 2020-12-21 1.解决房间修改图片后，分类页面对应房间图标没及时刷新问题。
---
HDL_ON/Entity/Function/Function.cs | 42 +++++++++++++++++++++++++++---------------
1 files changed, 27 insertions(+), 15 deletions(-)
diff --git a/HDL_ON/Entity/Function/Function.cs b/HDL_ON/Entity/Function/Function.cs
index ddafe50..192d53b 100644
--- a/HDL_ON/Entity/Function/Function.cs
+++ b/HDL_ON/Entity/Function/Function.cs
@@ -173,8 +173,8 @@
max = 1,
min = 0,
};
+ _trait_on_off.curValue = "on";
}
- _trait_on_off.curValue = "on";
}
return _trait_on_off;
}
@@ -231,11 +231,11 @@
{
roomNameList += ",";
}
- roomNameList += findRoom.floorName + findRoom.roomName;
+ roomNameList += findRoom.floorName +"-"+ findRoom.roomName;
}
if (roomNameList == "" && functionType == FunctionType.Scene)
{
- roomNameList = Language.StringByID(StringId.WholeHouseScene);
+ roomNameList = Language.StringByID(StringId.WholeZone);
}
return roomNameList;
}
@@ -286,19 +286,30 @@
var sFunc = new SceneFunction();
foreach (var attr in attributes)
{
- if (attr.curValue.ToString() == "{}")
+ switch (attr.key)
{
- attr.curValue = "0";
- }
- if (attr.key == FunctionAttributeKey.SetTemp)
- {
- double vv = 16;
- Double.TryParse(attr.curValue.ToString(),out vv);
- sFunc.status.Add(new SceneFunctionStatus() { key = attr.key, value = Convert.ToInt32(vv).ToString() });
- }
- else
- {
- sFunc.status.Add(new SceneFunctionStatus() { key = attr.key, value = attr.curValue.ToString() });
+ case FunctionAttributeKey.OnOff:
+ case FunctionAttributeKey.Brightness:
+ case FunctionAttributeKey.Mode:
+ case FunctionAttributeKey.SetTemp:
+ case FunctionAttributeKey.FanSpeed:
+ case FunctionAttributeKey.Percent:
+ case FunctionAttributeKey.FadeTime:
+ if (attr.curValue.ToString() == "{}")
+ {
+ attr.curValue = "0";
+ }
+ if (attr.key == FunctionAttributeKey.SetTemp)
+ {
+ double vv = 16;
+ Double.TryParse(attr.curValue.ToString(), out vv);
+ sFunc.status.Add(new SceneFunctionStatus() { key = attr.key, value = Convert.ToInt32(vv).ToString() });
+ }
+ else
+ {
+ sFunc.status.Add(new SceneFunctionStatus() { key = attr.key, value = attr.curValue.ToString() });
+ }
+ break;
}
}
sFunc.sid = this.sid;
@@ -343,6 +354,7 @@
ApiAlinkControlActionObj aaao = new ApiAlinkControlActionObj();
aaao.deviceId = this.deviceId;
aaao.spk = this.spk;
+ aaao.bus = this.bus;
foreach (var kv in keyValues)
{
aaao.attributes.Add(new AlinkControlAttributes()
--
Gitblit v1.8.0