~wjc/HomeApp.git

			@@ -248,6 +248,20 @@
			//添加【室内机设置】行(空调专用)
			this.AddIndoorUnitSettionRow();
			}
			else if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_SimpleMultifunction)
			{
			//简约多功能面板
			this.AddIBindRow();
			this.AddFunctionSettionRow();
			this.AddHumiditySourceRow();
			this.AddTemperatureSensorRow();

			}
			else if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_SimpleEnvironment)
			{
			//添加【绑定目标】行(简约环境面板用)
			this.AddSimplePanelSettionRow();
			}
			else
			{
			//添加【工作模式】行(pir传感器专用)
			@@ -268,7 +282,16 @@
			if (this.CheckCanShowFunctionSettionRow() == true)
			{
			//添加【功能设置】行
			this.AddFunctionSettionRow();
			if (deviceEnumInfo.ConcreteType == DeviceConcreteType.Sensor_PMTwoPointFive)
			{
			//PM传感器
			this.AddFunctionSettionRowPM();
			}
			else
			{
			this.AddFunctionSettionRow();
			}

			}

			//添加【干接点设置】行
			@@ -522,6 +545,31 @@
			};
			}

			#region ■ 简约环境(面板)_____________________

			/// <summary>
			/// 添加【按键设置】行简约环境(面板)
			/// </summary>
			private void AddSimplePanelSettionRow()
			{
			//按键设置
			string caption = Language.StringByID(R.MyInternationalizationString.uPanelSettion);
			var btnFunction = new FrameRowControl(listview.rowSpace / 2);
			listview.AddChidren(btnFunction);
			btnFunction.AddLeftCaption(caption, 600);
			//向右图标
			btnFunction.AddRightArrow();
			//底线
			btnFunction.AddBottomLine();
			btnFunction.ButtonClickEvent += (sender, e) =>
			{
			var form = new DeviceBind.PanelSimpleEnvironmentTargetsForm();

			};
			}

			#endregion

			#endregion

			#region ■ 按键设置(方悦)_____________________
			@@ -682,7 +730,7 @@
			//只有回路数大于1才能有这个菜单
			if (Common.LocalDevice.Current.GetDevicesCountByMac(listNewDevice[0].DeviceAddr) == 1)
			{
			//要求新风小模块的新风有功能设置
			//新风小模块只有一个回路，但要求新风小模块的新风有功能设置
			if (deviceEnumInfo.ConcreteType != DeviceConcreteType.Relay_FangyueFreshAirModul)
			{
			return;
			@@ -727,7 +775,7 @@
			\|\| deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueEight)
			{
			var form = new DevicePanel.PanelFangyueFunctionSettionForm();
			form.AddForm(listNewDevice[0]);
			form.AddForm(listNewDevice[0], deviceEnumInfo);
			}
			//河东的面板设备
			else if (deviceEnumInfo.BeloneType == DeviceBeloneType.A按键面板 && deviceEnumInfo.IsHdlDevice == true)
			@@ -740,6 +788,27 @@
			var form = new DeviceFunctionSettionForm();
			form.AddForm(listNewDevice[0], false);
			}
			};
			}

			/// <summary>
			/// 添加传感器【功能设置】行
			/// </summary>
			private void AddFunctionSettionRowPM()
			{
			//功能设置
			string caption = Language.StringByID(R.MyInternationalizationString.uFunctionSettingUp);
			var btnFunction = new FrameRowControl(listview.rowSpace / 2);
			listview.AddChidren(btnFunction);
			btnFunction.AddLeftCaption(caption, 600);
			//向右图标
			btnFunction.AddRightArrow();
			//底线
			btnFunction.AddBottomLine();
			btnFunction.ButtonClickEvent += (sender, e) =>
			{
			var form = new DeviceFunctionSettionForm();
			form.AddForm(listNewDevice[0], false);
			};
			}

			@@ -815,23 +884,24 @@
			btnFunction.AddLeftCaption(caption, 600);
			//开关图标
			var btnSwitch = btnFunction.AddMostRightSwitchIcon();
			//如果当前住宅是虚拟住宅的话,让所有菜单都不能点击
			if (Common.Config.Instance.Home.IsVirtually == true)
			{
			btnSwitch.CanClick = false;
			}
			//底线
			btnFunction.AddBottomLine();
			btnSwitch.ButtonClickEvent += async (sender, e) =>
			btnSwitch.ButtonClickEvent += (sender, e) =>
			{
			//切换模式
			bool statu = !btnSwitch.IsSelected;
			var result = await HdlDeviceCurtainLogic.Current.SetHandPullControl(deviceCurtain, statu);
			var result = HdlDeviceCurtainLogic.Current.SetHandPullControl(deviceCurtain, statu);
			if (result == true)
			{
			btnSwitch.IsSelected = statu;
			}
			};
			//如果是虚拟住宅
			if (Common.Config.Instance.Home.IsVirtually == true)
			{
			btnSwitch.IsSelected = ModelData.DeviceModelDataLogic.Current.GetCurtainHandPullControl(deviceCurtain);
			return;
			}

			//添加属性上报监听
			string mainkeys = LocalDevice.Current.GetDeviceMainKeys(this.listNewDevice[0]);
			@@ -891,7 +961,115 @@
			form.AddForm(listNewDevice[0].DeviceAddr);
			};
			}
			#endregion

			#region ■ 简约多功能面板用___________________
			/// <summary>
			/// 添加【绑定目标】行
			/// </summary>
			private void AddIBindRow()
			{
			string bindTargets = Language.StringByID(R.MyInternationalizationString.uBindTargets);
			var btnBindTargets = new FrameRowControl(listview.rowSpace / 2);
			listview.AddChidren(btnBindTargets);
			btnBindTargets.AddLeftCaption(bindTargets, 600);
			//向右图标
			btnBindTargets.AddRightArrow();
			//底线
			btnBindTargets.AddBottomLine();
			btnBindTargets.ButtonClickEvent += (sender, e) =>
			{
			var form = new DeviceBind.PanelSimpleMutilfunctionTargetsForm();
			};
			}

			/// <summary>
			/// 湿度来源行
			/// </summary>
			private void AddHumiditySourceRow()
			{
			//湿度
			var rowHumidity = new FrameRowControl(listview.rowSpace / 2);
			listview.AddChidren(rowHumidity);
			rowHumidity.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.HumiditySource), 600);
			//底线
			rowHumidity.AddBottomLine();
			//右箭头
			rowHumidity.AddRightArrow();
			var msg = Language.StringByID(R.MyInternationalizationString.nothing);
			//if (!string.IsNullOrEmpty(bindHumidityName))
			//{
			// msg = bindHumidityName;
			//}
			var btnHumidityStatu = rowHumidity.AddMostRightView(msg, 700);
			rowHumidity.ButtonClickEvent += (sender, e) =>
			{
			//var key = new Panel();
			//var bindHumiditySensorPage = new Shared.Phone.UserCenter.DeviceBind.PanelSimpleMutilfunctionBindSensorForm(key, bindHumidityDev, 3);
			//Shared.Phone.UserView.HomePage.Instance.AddChidren(bindHumiditySensorPage);
			//Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
			//bindHumiditySensorPage.Show();

			//bindHumiditySensorPage.actionHumidityTarget += (bindName) =>
			//{
			// Application.RunOnMainThread(() =>
			// {
			// if (string.IsNullOrEmpty(bindName))
			// {
			// btnHumidityStatu.Text = Language.StringByID(R.MyInternationalizationString.nothing);
			// }
			// else
			// {
			// btnHumidityStatu.Text = bindName;
			// }
			// });
			//};
			};
			}

			/// <summary>
			/// 温度来源行
			/// </summary>
			private void AddTemperatureSensorRow()
			{
			//温度来源
			var rowTemPerature = new FrameRowControl(listview.rowSpace / 2);
			listview.AddChidren(rowTemPerature);
			rowTemPerature.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.TemperatureSource), 600);
			//底线
			rowTemPerature.AddBottomLine();
			//右箭头
			rowTemPerature.AddRightArrow();
			var msg = Language.StringByID(R.MyInternationalizationString.nothing);
			//if (!string.IsNullOrEmpty(bindTemperatureName))
			//{
			// msg = bindTemperatureName;
			//}
			var btnTemperatureStatu = rowTemPerature.AddMostRightView(msg, 700);
			rowTemPerature.ButtonClickEvent += (sender, e) =>
			{
			//var key = new Panel();
			//var bindTemperatureSensorPage = new Shared.Phone.UserCenter.DeviceBind.PanelFangyueFreshAirTargetsForm(key, bindTemperatureDev, 2);
			//Shared.Phone.UserView.HomePage.Instance.AddChidren(bindTemperatureSensorPage);
			//Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
			//bindTemperatureSensorPage.Show();

			//bindTemperatureSensorPage.actionTemperatureTarget += (bindName) =>
			//{
			// Application.RunOnMainThread(() =>
			// {
			// if (string.IsNullOrEmpty(bindName))
			// {
			// btnTemperatureStatu.Text = Language.StringByID(R.MyInternationalizationString.nothing);
			// }
			// else
			// {
			// btnTemperatureStatu.Text = bindName;
			// }
			// });
			//};
			};
			}
			#endregion

			#region ■ 功能类型(空气开关专用)_____________
			@@ -1004,7 +1182,7 @@
			btnNewVersion.Visible = false;
			btnNewVersion.X = Application.GetRealWidth(242);
			btnNewVersion.Y = Application.GetRealHeight(23);
			rowUpDate.AddChidren(btnNewVersion, ChidrenBindMode.BindEventOnly);
			rowUpDate.AddChidren(btnNewVersion, ChidrenBindMode.BindEvent);

			rowUpDate.ButtonClickEvent += (sender, e) =>
			{
			@@ -1087,11 +1265,11 @@
			/// 设备重命名
			/// </summary>
			/// <param name="i_deviceName">deviceName.</param>
			private async void DeviceReName(string i_deviceName, bool closeForm)
			private void DeviceReName(string i_deviceName, bool closeForm)
			{
			//修改MAC名
			string deviceName = i_deviceName.Trim();
			var result = await Common.LocalDevice.Current.ReMacName(this.listNewDevice, deviceName);
			var result = Common.LocalDevice.Current.ReMacName(this.listNewDevice, deviceName);
			if (result == false)
			{
			return;
			@@ -1208,6 +1386,12 @@
			//移除获取设备硬件信息的监听线程
			HdlDeviceHardInfoLogic.Current.RemoveDeviceHardInfoThread(listNewDevice[0]);

			//设备新入网
			if (UserCenterResourse.DicActionForm.ContainsKey("AddDeviceTypeListForm") == true)
			{
			this.LoadFormMethodByName("DeviceListMainForm", "RefreshDeviceRow", new object[] { listNewDevice[0].DeviceAddr });
			}

			base.CloseFormBefore();
			}