From c404f2f369710fe72bbcc4cff2b7b8a2c11b5ff1 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期二, 02 三月 2021 17:48:32 +0800
Subject: [PATCH] Merge branch 'master' into wjc
---
Crabtree/SmartHome/HDL/Operation/Device/Common.cs | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/Crabtree/SmartHome/HDL/Operation/Device/Common.cs b/Crabtree/SmartHome/HDL/Operation/Device/Common.cs
index 8c70d7b..d486876 100644
--- a/Crabtree/SmartHome/HDL/Operation/Device/Common.cs
+++ b/Crabtree/SmartHome/HDL/Operation/Device/Common.cs
@@ -26,7 +26,7 @@
}
public byte LoopID;
- public byte sceneID = 0;
+ //public byte sceneID = 0;
public byte LoopCount = 1;
/// <summary>
@@ -51,6 +51,17 @@
}
}
+ /// <summary>
+ /// 璁惧绫诲瀷澶х被灏忕被 16杩涘埗瀛楃
+ /// </summary>
+ [Newtonsoft.Json.JsonIgnore]
+ public virtual string DeviceTypeString {
+ get {
+ return ((int)this.Type).ToString ("X4");
+ }
+ }
+
+
//public string IconPath {
// get{
// string iconPath = "";
--
Gitblit v1.8.0