请合并最新代码，优化绑定信息

xm

2020-05-08 6bca8fcd37a48808a0b9c9342fc1be0adddfece6

 ZigbeeApp/Shared/Common/Device.cs

old mode 100755
new mode 100644
@@ -115,7 +115,7 @@
            {

                CommonDevice device = null;

                //反序列化为指定的类，不然数据会丢失而导致无法强转

                try 
                try
                {

                    device = CommonDevice.CommonDeviceByFilePath(file);

                }

@@ -2079,8 +2079,8 @@
            list.Add(DeviceBeloneType.A传感器);



            //其他的看着办呗,都是排在后面的,都归为这个属性

            list.Add(DeviceBeloneType.A未知设备);

            
            list.Add(DeviceBeloneType.A未知设备);

            return list;

        }



@@ -2673,6 +2673,9 @@
            this.dicDeviceModelIdEnum["MBU01/M-ZB.10"] = "1305-1200-60000";//紧急按键

            this.dicDeviceModelIdEnum["MGCD01/ZB.10"] = "1306-1200-60000";//吸顶燃气传感器



            //PM2.5空气质量传感器 【该设备属于第三方设备，没有镜像ID】

            this.dicDeviceModelIdEnum["SZ_PM100"] = "1307-1200-60000";//PM2.5空气质量传感器 


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

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

            this.dicDeviceModelIdEnum["MFA01-ZB.10"] = "2310-2300-60011";//方悦新风小模块

@@ -2862,7 +2865,12 @@
        /// <summary>

        /// 吸顶燃气传感器

        /// </summary>

        Sensor_CeilingGas = 1306,

        Sensor_CeilingGas = 1306,
        /// <summary>
        /// PM2.5空气质量传感器
        /// </summary>
        Sensor_PMTwoPointFive = 1307,


        /// <summary>

        /// 运动传感器

        /// </summary>

@@ -2896,9 +2904,9 @@
        /// <summary>

        /// 方悦新风小模块 镜像id：2310

        /// </summary>

        Relay_FangyueFreshAirModul = 2310,

		
        //=========★★调光器类(2500-2799)★★=========

        Relay_FangyueFreshAirModul = 2310,

        //=========★★调光器类(2500-2799)★★=========
        /// <summary>

        /// 调光器

        /// </summary>