~wjc/HomeApp.git

			@@ -602,7 +602,7 @@
			btnFunction.ButtonClickEvent += (sender, e) =>
			{
			//简约环境面板的按键配置
			var form = new DevicePanel.PanelSimpleEnvironmentButtonSettionForm();
			var form = new DevicePanel.PanelSettionWithSourceForm();
			form.AddForm(listNewDevice[0]);
			};
			}
			@@ -643,16 +643,10 @@
			var form = new DevicePanel.PanelFangyueButtonSettionForm();
			form.AddForm(listNewDevice[0]);
			}
			else if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueEnvironment)
			else if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueEnvironment \|\| deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueFreshAir)
			{
			//方悦环境面板的按键配置
			var form = new DevicePanel.PanelFangyueEnvironmentButtonSettionForm();
			form.AddForm(listNewDevice[0]);
			}
			else if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueFreshAir)
			{
			//方悦新风面板的按键配置
			var form = new DevicePanel.PanelFangyueFreshAirButtonSettionForm();
			//方悦环境面板的按键配置&方悦新风面板的按键配置
			var form = new DevicePanel.PanelSettionWithSourceForm();
			form.AddForm(listNewDevice[0]);
			}
			else
			@@ -713,8 +707,7 @@
			private void AddPirSensorWorkModeRow()
			{
			if (this.deviceEnumInfo.ConcreteType != DeviceConcreteType.Sensor_Pir
			\|\| deviceEnumInfo.IsHdlDevice == false
			\|\| this.listNewDevice.Count != 2)
			\|\| deviceEnumInfo.IsHdlDevice == false)
			{
			return;
			}
			@@ -743,8 +736,7 @@
			/// </summary>
			private void AddPirSensorBindRow()
			{
			if (this.deviceEnumInfo.ConcreteType != DeviceConcreteType.Sensor_Pir
			\|\| this.listNewDevice.Count != 2)
			if (this.deviceEnumInfo.ConcreteType != DeviceConcreteType.Sensor_Pir)
			{
			return;
			}
			@@ -1078,7 +1070,7 @@
			paneTargetsBaseFormp.Show();
			paneTargetsBaseFormp.actionHumidityTarget += (bindName) =>
			{
			Application.RunOnMainThread(() =>
			HdlThreadLogic.Current.RunMain(() =>
			{
			if (string.IsNullOrEmpty(bindName))
			{
			@@ -1129,7 +1121,7 @@
			paneTargetsBaseFormp.Show();
			paneTargetsBaseFormp.actionTemperatureTarget += (bindName) =>
			{
			Application.RunOnMainThread(() =>
			HdlThreadLogic.Current.RunMain(() =>
			{
			if (string.IsNullOrEmpty(bindName))
			{
			@@ -1164,7 +1156,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_2" + ")", Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);
			});
			return;
			}
			@@ -1176,7 +1168,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_3" + ")", Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);
			});
			return;
			}
			@@ -1439,13 +1431,13 @@

			if (deviceFirmware != null && deviceFirmware.FirmwareVersion > oTADevice.ImgVersion)
			{
			Application.RunOnMainThread(() =>
			HdlThreadLogic.Current.RunMain(() =>
			{
			if (btnNewVersion != null)
			{
			btnNewVersion.Visible = true;
			}
			});
			}, ShowErrorMode.NO);
			}
			});
			}