~wjc/HomeApp.git

			@@ -2255,7 +2255,7 @@
			//新设备添加方法：
			//1、在这里填写上模块ID，然后是 DeviceConcreteType ，然后是 DeviceBeloneType
			//2、然后在最下面添加【设备的具体类型】，【设备的所属类型】
			//3、已设备的具体类型为名字(去掉【-】)添加设备的【所属图片】，【真实物理图片】。回路图片需要特殊处理
			//3、以设备的具体类型为名字(去掉【-】)添加设备的【所属图片】，【真实物理图片】。回路图片需要特殊处理
			//4、添加R文件,添加Language文件
			//*********************************************************************

			@@ -2272,6 +2272,11 @@
			this.dicDeviceModelIdEnum["MPT4R4L/S-ZB.18"] = "220-200";//简约4按键面板
			this.dicDeviceModelIdEnum["MPT3R3L/S-ZB.18"] = "221-200";//简约3按键面板
			this.dicDeviceModelIdEnum["MPT2R2L/S-ZB.18"] = "222-200";//简约2按键面板
			this.dicDeviceModelIdEnum["MP2B/TILE-ZB.18"] = "240-200";//方悦2按键轻触式面板
			this.dicDeviceModelIdEnum["MP4B/TILE-ZB.18"] = "241-200";//方悦4按键轻触式面板
			this.dicDeviceModelIdEnum["MP8B/TILE-ZB.18"] = "242-200";//方悦8按键轻触式面板
			this.dicDeviceModelIdEnum["MPFA/TILE-ZB.18"] = "250-200";//方悦新风面板
			this.dicDeviceModelIdEnum["MPTE3/TILE-ZB.18"] = "253-200";//方悦环境面板

			//=========★★PIR传感器类(1200-1299)★★=========
			this.dicDeviceModelIdEnum["MSPIR01-ZB.10"] = "1200-1200";//pir传感器220
			@@ -2396,6 +2401,26 @@
			/// 简约2按键面板镜像id：222
			/// </summary>
			ButtonPanel_SimpleTwo = 222,
			/// <summary>
			/// 方悦2按键轻触式面板镜像id：240
			/// </summary>
			ButtonPanel_FangyueTwo = 240,
			/// <summary>
			/// 方悦4按键轻触式面板镜像id：241
			/// </summary>
			ButtonPanel_FangyueFour = 241,
			/// <summary>
			/// 方悦8按键轻触式面板镜像id：242
			/// </summary>
			ButtonPanel_FangyueEight = 242,
			/// <summary>
			/// 方悦新风面板镜像id：250
			/// </summary>
			ButtonPanel_FangyueNewWind = 250,
			/// <summary>
			/// 方悦环境面板镜像id：253
			/// </summary>
			ButtonPanel_FangyueEnvironment = 253,

			//=========★★PIR传感器类(1200-1299)★★=========
			/// <summary>