~wjc/HomeApp.git

			@@ -8,7 +8,7 @@
			namespace Shared.Phone.UserCenter.DevicePanel
			{
			/// <summary>
			/// 方悦新风面板的按键配置界面
			/// 面板的按键配置界面【该类暂时舍弃】
			/// </summary>
			public class PanelSimpleEnvironmentButtonSettionForm : EditorCommonForm
			{
			@@ -164,7 +164,7 @@

			Application.RunOnMainThread(() =>
			{
			new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);
			new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime) + "(" + "5007" + ")", Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);
			});
			}
			}
			@@ -208,7 +208,10 @@
			foreach (var bDev in bindList)
			{
			var device = Common.LocalDevice.Current.GetDevice(bDev.BindMacAddr, bDev.BindEpoint);

			if (device == null)
			{
			continue;
			}
			if (device.Type == DeviceType.FreshAir)
			{
			//获取设备类型的
			@@ -218,15 +221,7 @@
			{
			continue;
			}
			if (string.IsNullOrEmpty(bDev.ESName))
			{
			bindFreshAirName = Common.LocalDevice.Current.GetDeviceEpointName(device);
			}
			else
			{
			bindFreshAirName = bDev.ESName;
			}

			bindFreshAirName = Common.LocalDevice.Current.GetDeviceEpointName(device);
			bindFreshAirDev = device;
			}
			else if (device.Type == DeviceType.TemperatureSensor)
			@@ -234,55 +229,37 @@
			var bD = device as TemperatureSensor;
			if (bD.SensorDiv == 1)
			{
			if (string.IsNullOrEmpty(bDev.ESName))
			{
			bindTemperatureName = Common.LocalDevice.Current.GetDeviceEpointName(device);
			}
			else
			{
			bindTemperatureName = bDev.ESName;
			}
			bindTemperatureName = Common.LocalDevice.Current.GetDeviceEpointName(device);
			bindTemperatureDev = device;
			}
			if (bD.SensorDiv == 2)
			{
			if (string.IsNullOrEmpty(bDev.ESName))
			{
			bindHumidityName = Common.LocalDevice.Current.GetDeviceEpointName(device);
			}
			else
			{
			bindHumidityName = bDev.ESName;
			}

			bindHumidityName = Common.LocalDevice.Current.GetDeviceEpointName(device);
			bindHumidityDev = device;
			}
			}
			else if (device.Type == DeviceType.FreshAirHumiditySensor)
			{
			if (string.IsNullOrEmpty(bDev.ESName))
			{
			bindHumidityName = Common.LocalDevice.Current.GetDeviceEpointName(device);
			}
			else
			{
			bindHumidityName = bDev.ESName;
			}

			bindHumidityName = Common.LocalDevice.Current.GetDeviceEpointName(device);
			bindHumidityDev = device;
			}
			else if (device.Type == DeviceType.Thermostat)
			{
			if (string.IsNullOrEmpty(bDev.ESName))
			{
			bindAcName = Common.LocalDevice.Current.GetDeviceEpointName(device);
			}
			else
			{
			bindAcName = bDev.ESName;
			}

			bindAcName = Common.LocalDevice.Current.GetDeviceEpointName(device);
			bindAcDev = device;
			}
			else if (device.Type == DeviceType.PMSensor)
			{
			if (bDev.BindCluster == 1026)
			{
			bindTemperatureName = Common.LocalDevice.Current.GetDeviceEpointName(device) + "-" + Language.StringByID(R.MyInternationalizationString.TemperatureSensor);
			bindTemperatureDev = device;
			}
			if (bDev.BindCluster == 1029)
			{
			bindHumidityName = Common.LocalDevice.Current.GetDeviceEpointName(device) + "-" + Language.StringByID(R.MyInternationalizationString.HumiditySensor);
			bindHumidityDev = device;
			}
			}
			}
			count++;
			@@ -458,7 +435,7 @@
			var btnHumidityStatu = rowHumidity.AddMostRightView(msg, 700);
			rowHumidity.ButtonClickEvent += (sender, e) =>
			{
			this.deviceObj.DeviceEpoint = 2;
			this.deviceObj.DeviceEpoint = 1;
			var paneTargetsBaseFormp = new PaneTargetsBaseForm(this.deviceObj, bindAcDev, DeviceBind.BindInfo.BindType.Humidity);
			Shared.Phone.UserView.HomePage.Instance.AddChidren(paneTargetsBaseFormp);
			Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;