From 917c28d31963e893d7dd26f933adfa3bde3cf260 Mon Sep 17 00:00:00 2001 From: Davin <591807572@qq.com> Date: 星期三, 26 七月 2023 15:54:29 +0800 Subject: [PATCH] feature 门锁不支持一键开锁设备按钮置灰&&门锁呼叫 --- HDL_ON/Entity/Function/Scene.cs | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/HDL_ON/Entity/Function/Scene.cs b/HDL_ON/Entity/Function/Scene.cs index 3b00095..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> -- Gitblit v1.8.0