合并代码

xm

2020-04-22 dfa6733793434bdcfd394f978ae72f1628b2260f

 ZigbeeApp/Shared/Common/Device.cs

old mode 100755
new mode 100644
@@ -1767,6 +1767,14 @@
                }

                info.ObjectTypeNameId = 60000;//传感器

            }

            //14新风设备
            else if (dicType.ContainsKey(DeviceType.FreshAir) == true)

            {

                info.ConcreteTextId = R.MyInternationalizationString.DeviceModelId2310;

                info.BeloneType = DeviceBeloneType.A新风;

                info.ConcreteType = DeviceConcreteType.Relay_FangyueFreshAirModul;

                info.ObjectTypeNameId = 60011;//新风

            }



            int value = (int)info.BeloneType;

            if (dicDeviceAllNameID.ContainsKey("uDeviceBelongId" + value) == true)

@@ -3002,7 +3010,11 @@
        /// <summary>

        /// 干接点

        /// </summary>

        A干接点 = 16

        A干接点 = 16,
        /// <summary>

        /// 新风

        /// </summary>

        A新风 = 17

    }



    #endregion