From 9a0b765c583bd69929de3a7495138b3e878e4543 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 05 九月 2023 16:14:27 +0800
Subject: [PATCH] 0-10v更新，网关在线状态更新
---
HDL_ON/Entity/Function/Scene.cs | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/HDL_ON/Entity/Function/Scene.cs b/HDL_ON/Entity/Function/Scene.cs
index 1e6d11d..04888ab 100644
--- a/HDL_ON/Entity/Function/Scene.cs
+++ b/HDL_ON/Entity/Function/Scene.cs
@@ -151,6 +151,7 @@
/// 閰嶅悎璞嗚眴淇敼浜戠鏁版嵁
/// 璋冭瘯瀹濄�乷n pro鍜屽钩鍙板搴�
/// </summary>
+ [Newtonsoft.Json.JsonIgnore]
public List<SceneImageInfo> OssSceneImages = new List<SceneImageInfo>()
{
new SceneImageInfo
@@ -430,6 +431,7 @@
{
var ssd = System.Text.Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(this));
Common.FileUtlis.Files.WriteFileByBytes(savePath, ssd);
+ return revPack.Code;
}
var scenes = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Scene>>(revPack.Data.ToString());
var tempScene = scenes.Find((obj) => obj.sid == sid);
@@ -560,6 +562,10 @@
private Function ConvertFunctionObject()
{
var localFunction = FunctionList.List.GetDeviceFunctionList().Find((obj) => obj.sid == sid);
+ if(localFunction == null)
+ {
+ localFunction = FunctionList.List.groupControls.Find((obj) => obj.sid == sid);
+ }
return localFunction;
}
@@ -592,8 +598,8 @@
}
if (tempState != null)
{
- sceneFunctionInfo += tempState.GetValueText() + " ";
- sceneFunctionInfo += tempState.GetUintString();
+ sceneFunctionInfo += tempState.GetValueText();
+ sceneFunctionInfo += tempState.GetUintString() + " ";
}
if (fanState != null)
{
--
Gitblit v1.8.0