~wjc/HomeApp.git

			@@ -1003,15 +1003,8 @@
			//继电器,掉光器都叫回路
			return Language.StringByID(R.MyInternationalizationString.uDeviceCircuit) + epointNo;
			}
			//获取设备类型
			var deviceInfoType = this.GetMyDeviceEnumInfo(new List<CommonDevice>() { device });
			if (device.Type == DeviceType.Thermostat)
			{
			//新风面板中的Thermostat叫温度传感器
			if (deviceInfoType.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueFreshAir)
			{
			return Language.StringByID(R.MyInternationalizationString.TemperatureSensor);
			}
			//空调都叫室内机
			return Language.StringByID(R.MyInternationalizationString.uIndoorUnit) + epointNo;
			}
			@@ -1025,7 +1018,10 @@
			//新风面板湿度传感器
			return Language.StringByID(R.MyInternationalizationString.HumiditySensor);
			}
			else if (device.Type == DeviceType.OnOffSwitch)

			//获取设备类型
			var deviceInfoType = this.GetMyDeviceEnumInfo(new List<CommonDevice>() { device });
			if (device.Type == DeviceType.OnOffSwitch)
			{
			//面板的干接点叫按键
			if (deviceInfoType.BeloneType == DeviceBeloneType.A按键面板)
			@@ -1036,6 +1032,19 @@
			else
			{
			return Language.StringByID(R.MyInternationalizationString.uDeviceBelongId16) + epointNo;
			}
			}
			else if (device.Type == DeviceType.TemperatureSensor)
			{
			if (deviceInfoType.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueFreshAir)
			{
			//新风面板中的Thermostat为温度传感器
			return Language.StringByID(R.MyInternationalizationString.TemperatureSensor);
			}
			else if (deviceInfoType.BeloneType == DeviceBeloneType.A按键面板)
			{
			//面板的温度探头叫面板名字+温度
			return Language.StringByID(deviceInfoType.DefultNameId) + Language.StringByID(R.MyInternationalizationString.uTemperature);
			}
			}
			//其他情况,使用它的默认名称
			@@ -2599,7 +2608,7 @@

			//=========★★继电器类(2300-2499)★★=========
			this.dicDeviceModelIdEnum["MPR0310-ZB.10"] = "2300-2300-60001";//3路继电器小模块
			this.dicDeviceModelIdEnum["MFA01-ZB1.0"] = "2310-2300-60001";//方悦新风小模块
			this.dicDeviceModelIdEnum["MFA01-ZB.10"] = "2310-2300-60011";//方悦新风小模块

			//=========★★调光器类(2500-2799)★★=========
			this.dicDeviceModelIdEnum["MPD0101-ZB.10"] = "2500-2500-60007";//1路调光器小模块