From 489d3bd60ad7dc2fecb398b09cf4c52df16f0fc2 Mon Sep 17 00:00:00 2001
From: Davin <591807572@qq.com>
Date: 星期三, 26 七月 2023 15:55:30 +0800
Subject: [PATCH] Merge branch 'Dev-Branch' of http://59.41.255.150:6688/r/~wxr/OnPro into Dev-Branch
---
HDL_ON/Entity/Function/Scene.cs | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/HDL_ON/Entity/Function/Scene.cs b/HDL_ON/Entity/Function/Scene.cs
index 9be9505..fdf195b 100644
--- a/HDL_ON/Entity/Function/Scene.cs
+++ b/HDL_ON/Entity/Function/Scene.cs
@@ -560,6 +560,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;
}
@@ -629,7 +633,12 @@
return sceneFunctionInfo;
}
-
+ /// <summary>
+ /// 璁惧
+ /// 鍦烘櫙 =scene
+ /// 缇ゆ帶=5
+ /// </summary>
+ public string type = "0";
}
/// <summary>
@@ -706,7 +715,7 @@
/// </summary>
public string GetUintString()
{
- if (!string.IsNullOrEmpty(UintString))
+ if (!string.IsNullOrEmpty(UintString) && UintString!= "{}")
{
return UintString;
}
--
Gitblit v1.8.0