请合并小模块

xm

2020-04-30 2eacb04ca1ec0ad20fda4186b59a9bce67004cb4

 ZigbeeApp/Shared/Common/Device.cs

old mode 100755
new mode 100644
@@ -2060,6 +2060,7 @@
            list.Add(DeviceBeloneType.A插座);

            list.Add(DeviceBeloneType.A调光器);

            list.Add(DeviceBeloneType.A窗帘);

            list.Add(DeviceBeloneType.A新风);

            list.Add(DeviceBeloneType.A空调);

            list.Add(DeviceBeloneType.A继电器);

            list.Add(DeviceBeloneType.A干接点);

@@ -2648,7 +2649,9 @@
            this.dicDeviceModelIdEnum["MSS01/M-ZB.10"] = "1302-1300-60000";//烟雾传感器

            this.dicDeviceModelIdEnum["MSPIR01/M-ZB.10"] = "1303-1300-60000";//红外传感器

            this.dicDeviceModelIdEnum["MSW01/M-ZB.10"] = "1304-1300-60000";//水浸传感器

            this.dicDeviceModelIdEnum["MBU01/M-ZB.10"] = "1305-1300-60000";//紧急按键

            this.dicDeviceModelIdEnum["MBU01/M-ZB.10"] = "1305-1300-60000";//紧急按键DZ_PM100-V1.6



            this.dicDeviceModelIdEnum["MSW01/M-ZB.10"] = "1306-1300-60000";//水浸传感器



            //=========★★继电器类(2300-2499)★★=========

            this.dicDeviceModelIdEnum["MPR0310-ZB.10"] = "2300-2300-60001";//3路继电器小模块

@@ -2992,6 +2995,10 @@
        /// </summary>

        A继电器 = 2300,

        /// <summary>

        /// 新风

        /// </summary>

        A新风 = 2310,

        /// <summary>

        /// 调光器(2500-2799)

        /// </summary>

        A调光器 = 2500,

@@ -3047,10 +3054,6 @@
        /// 干接点

        /// </summary>

        A干接点 = 16,

        /// <summary>

        /// 新风

        /// </summary>

        A新风 = 17

    }



    #endregion