From af9c3e0b3b1eb370e966b3ca9db3f62848d4189b Mon Sep 17 00:00:00 2001 From: JLChen <551775569@qq.com> Date: 星期六, 21 八月 2021 13:03:12 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/newBranch1' into WJC --- HDL_ON/Entity/Function/Scene.cs | 16 ++++++++++++++-- 1 files changed, 14 insertions(+), 2 deletions(-) diff --git a/HDL_ON/Entity/Function/Scene.cs b/HDL_ON/Entity/Function/Scene.cs index 29a3503..fa6176f 100644 --- a/HDL_ON/Entity/Function/Scene.cs +++ b/HDL_ON/Entity/Function/Scene.cs @@ -77,12 +77,19 @@ public string group = "1"; /// <summary> /// 鍦烘櫙绫诲瀷 + /// 0:鏅�� + /// 1:鐢靛奖 + /// 2:璋冨厜 /// </summary> public SceneType sceneType = SceneType.OrdinaryScenes; /// <summary> /// 鏀惰棌鏍囪 /// </summary> public bool collect = false; + /// <summary> + /// 鏄惁鍏佽鍒犻櫎 + /// </summary> + public bool can_delete = true; /// <summary> /// 鍒涘缓璇ュ満鏅殑鐢ㄦ埛ID @@ -542,10 +549,15 @@ /// <summary> /// 灞炴�у�煎崟浣� /// </summary> - public string GetUintString() + public string GetUintString(string inputKey = "") { var us = ""; - switch (key) + var swithchString = key; + if(!string.IsNullOrEmpty(inputKey)) + { + swithchString = inputKey; + } + switch (swithchString) { case FunctionAttributeKey.SetTemp: case FunctionAttributeKey.RoomTemp: -- Gitblit v1.8.0