Merge branch 'master' into wjc

陈嘉乐

2021-03-02 c404f2f369710fe72bbcc4cff2b7b8a2c11b5ff1

 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 = "";