~wjc/HomeApp.git

old mode 100755 new mode 100644

			@@ -115,7 +115,7 @@
			{
			CommonDevice device = null;
			//反序列化为指定的类，不然数据会丢失而导致无法强转
			try
			try
			{
			device = CommonDevice.CommonDeviceByFilePath(file);
			}
			@@ -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干接点);
			@@ -2068,8 +2069,8 @@
			list.Add(DeviceBeloneType.A传感器);

			//其他的看着办呗,都是排在后面的,都归为这个属性
			list.Add(DeviceBeloneType.A未知设备);

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

			return list;
			}

			@@ -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路继电器小模块
			@@ -2870,9 +2873,9 @@
			/// <summary>
			/// 方悦新风小模块镜像id：2310
			/// </summary>
			Relay_FangyueFreshAirModul = 2310,

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

			//=========★★调光器类(2500-2799)★★=========
			/// <summary>
			/// 调光器
			/// </summary>
			@@ -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