~wjc/HomeApp.git

			@@ -1770,7 +1770,7 @@
			//14新风设备
			else if (dicType.ContainsKey(DeviceType.FreshAir) == true)
			{
			info.ConcreteTextId = R.MyInternationalizationString.DeviceModelId2310;
			info.ConcreteTextId = R.MyInternationalizationString.uDeviceModelId2310;
			info.BeloneType = DeviceBeloneType.A新风;
			info.ConcreteType = DeviceConcreteType.Relay_FangyueFreshAirModul;
			info.ObjectTypeNameId = 60011;//新风
			@@ -2024,14 +2024,14 @@
			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干接点);
			list.Add(DeviceBeloneType.A智能门锁);
			list.Add(DeviceBeloneType.A智能空开);
			list.Add(DeviceBeloneType.A传感器);

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

			return list;
			@@ -2509,7 +2509,10 @@
			else if (deviceType == DeviceType.FreshAir) { device = new FreshAir(); }
			else if (deviceType == DeviceType.DoorLock) { device = new DoorLock(); }
			else if (deviceType == DeviceType.TemperatureSensor) { device = new TemperatureSensor(); }
			else if (deviceType == DeviceType.FreshAirHumiditySensor) { device = new HumiditySensor(); }
			else if (deviceType == DeviceType.FreshAirHumiditySensor)
			{
			device = new HumiditySensor();
			}
			else if (deviceType == DeviceType.OtaDevice \|\| deviceType == DeviceType.OtaPanelDevice) { device = new OTADevice(); }
			else { return null; }

			@@ -2648,13 +2651,12 @@
			this.dicDeviceModelIdChanged["MULTI-FIRE--EA05"] = "MSS01/M-ZB.10";//烟雾传感器
			this.dicDeviceModelIdChanged["MULTI-MOTI--EA04"] = "MSPIR01/M-ZB.10";//红外传感器
			this.dicDeviceModelIdChanged["MULTI-WATE--EA02"] = "MSW01/M-ZB.10";//水浸传感器
			this.dicDeviceModelIdChanged["MULTI-BURO--EA06"] = "MBU01/M-ZB.10";//紧急按键



			//✩✩✩✩✩需要共有的图片对象✩✩✩✩✩
			//两者都是DeviceConcreteType
			//Keys:指定的设备 value:沿用的图片是哪款设备的
			this.dicDeviceModelIdChanged["MULTI-BURO--EA06"] = "MBU01/M-ZB.10";//紧急按键


			//✩✩✩✩✩需要共有的图片对象✩✩✩✩✩
			//两者都是DeviceConcreteType
			//Keys:指定的设备 value:沿用的图片是哪款设备的
			this.dicPictrueShard = new Dictionary<string, string>();
			this.dicPictrueShard["ButtonPanel_SimpleFour"] = "ButtonPanel_Four";//简约4按键面板沿用 4按键的图标
			this.dicPictrueShard["ButtonPanel_SimpleThree"] = "ButtonPanel_Three";//简约3按键面板沿用 3按键的图标
			@@ -2822,6 +2824,11 @@
			/// </summary>
			Sensor_Humidity = -1310,

			/// <summary>
			/// PM2.5传感器
			/// </summary>
			Sensor_PM = -1311,

			//=========★★继电器类(2300-2499)★★=========
			/// <summary>
			/// 继电器
			@@ -2946,7 +2953,7 @@
			/// <summary>
			/// 按键面板(200-1199)
			/// </summary>
			A按键面板 = 200,
			A按键面板 = 200,
			/// <summary>
			/// 传感器(1200-2299)
			/// </summary>
			@@ -2954,7 +2961,11 @@
			/// <summary>
			/// 继电器(2300-2499)
			/// </summary>
			A继电器 = 2300,
			A继电器 = 2300,
			/// <summary>
			/// 新风
			/// </summary>
			A新风 = 2310,
			/// <summary>
			/// 调光器(2500-2799)
			/// </summary>
			@@ -3011,10 +3022,6 @@
			/// 干接点
			/// </summary>
			A干接点 = 16,
			/// <summary>
			/// 新风
			/// </summary>
			A新风 = 17
			}

			#endregion