From c00da77d00a479fa5d022346a6d9075f90a5c087 Mon Sep 17 00:00:00 2001
From: wxr <wxr@hdlchina.com.cn>
Date: 星期六, 14 九月 2024 10:05:34 +0800
Subject: [PATCH] 退出登录时间调整，新风，音乐
---
HDL_ON/Entity/Function/Scene.cs | 25 +++++++++++++++++--------
1 files changed, 17 insertions(+), 8 deletions(-)
diff --git a/HDL_ON/Entity/Function/Scene.cs b/HDL_ON/Entity/Function/Scene.cs
index 9065ef5..9b57845 100644
--- a/HDL_ON/Entity/Function/Scene.cs
+++ b/HDL_ON/Entity/Function/Scene.cs
@@ -87,6 +87,14 @@
/// 鏄惁鍏佽鍒犻櫎
/// </summary>
public bool can_delete = true;
+ /// <summary>
+ /// 鏄惁鍏佽缂栬緫
+ /// </summary>
+ public bool can_edit = true;
+ /// <summary>
+ /// 鏄惁鏄綉鍏虫湰鍦板満鏅�
+ /// </summary>
+ public bool local = false;
/// <summary>
/// 鍒涘缓璇ュ満鏅殑鐢ㄦ埛ID
@@ -562,25 +570,24 @@
/// <returns></returns>
private Function ConvertFunctionObject()
{
+ Function temp = null;
if (type == "7")
{
var logic = Logic.LogicList.Find((obj) => obj.sid == sid);
if (logic != null) {
- _localFunction = new Function()
- {
- name = logic.name
- };
+ temp = new Function();
+ temp.name = logic.name;
}
}
else
{
- var localFunction = FunctionList.List.GetDeviceFunctionList().Find((obj) => obj.sid == sid);
- if (localFunction == null)
+ temp = FunctionList.List.GetDeviceFunctionList().Find((obj) => obj.sid == sid);
+ if (temp == null)
{
- localFunction = FunctionList.List.groupControls.Find((obj) => obj.sid == sid);
+ temp = FunctionList.List.groupControls.Find((obj) => obj.sid == sid);
}
}
- return localFunction;
+ return temp;
}
@@ -722,6 +729,7 @@
/// <summary>
/// 灞炴�х殑鍊煎垪琛�
/// </summary>
+ [Newtonsoft.Json.JsonIgnore]
public List<string> valueList = new List<string>();
/// <summary>
/// 灞炴�у悕绉版樉绀烘枃鏈�
@@ -787,6 +795,7 @@
return text;
}
+ [Newtonsoft.Json.JsonIgnore]
public string UintString = "";
/// <summary>
--
Gitblit v1.8.0