~wjc/HomeApp.git

			@@ -2,7 +2,6 @@
			using System.Collections.Generic;
			using System.Threading.Tasks;
			using Shared.Common;
			using Shared.Phone.UserView;
			using ZigBee.Device;

			namespace Shared.Phone.UserCenter.Device
			@@ -21,7 +20,7 @@
			/// <summary>
			/// 列表控件
			/// </summary>
			private VerticalListControl listview = null;
			private FrameListControl listview = null;
			/// <summary>
			/// 设备的设备类型
			/// </summary>
			@@ -30,6 +29,10 @@
			/// 设备具体类型的信息
			/// </summary>
			private DeviceEnumInfo deviceEnumInfo = null;
			/// <summary>
			/// 中央空调的版本控件
			/// </summary>
			private NormalViewControl btnAirConditionerVersion = null;

			#endregion

			@@ -42,15 +45,11 @@
			public void ShowForm(string deviceMac)
			{
			this.listNewDevice = Common.LocalDevice.Current.GetDevicesByMac(deviceMac);
			//排序
			this.listNewDevice.Sort((obj1, obj2) =>
			if (listNewDevice.Count == 0)
			{
			if (obj1.DeviceEpoint > obj2.DeviceEpoint)
			{
			return 1;
			}
			return -1;
			});
			//针对单纯只有一个200端点的设备
			listNewDevice.Add(Common.LocalDevice.Current.GetOTADevice(deviceMac));
			}

			this.listDeviceType.Clear();
			foreach (var device in listNewDevice)
			@@ -62,7 +61,7 @@
			this.deviceEnumInfo = Common.LocalDevice.Current.GetMyDeviceEnumInfo(listNewDevice);

			//设置标题信息
			base.SetTitleText(Language.StringByID(R.MyInternationalizationString.uDeviceInfo));
			base.SetTitleText(Language.StringByID(R.MyInternationalizationString.uDeviceSettion));

			//初始化右上角菜单
			this.InitTopRightMenu();
			@@ -82,15 +81,19 @@
			//清空bodyFrame
			this.ClearBodyFrame();

			var listBackControl = new VerticalFrameControl();
			listBackControl.Height = bodyFrameLayout.Height;
			bodyFrameLayout.AddChidren(listBackControl);

			//初始化桌布
			var tableContr = new InformationEditorControl();
			this.listview = tableContr.InitControl(bodyFrameLayout, Language.StringByID(R.MyInternationalizationString.uInfoEditor), 369, 1368);
			this.listview = tableContr.InitControl(listBackControl.frameTable, Language.StringByID(R.MyInternationalizationString.uInfoEditor), 1368);

			//图片
			var btnPic = new DeviceInfoIconControl();
			btnPic.Y = Application.GetRealHeight(92);
			btnPic.Gravity = Gravity.CenterHorizontal;
			bodyFrameLayout.AddChidren(btnPic);
			listBackControl.frameTable.AddChidren(btnPic);
			btnPic.InitControl(listNewDevice[0]);

			//设备备注
			@@ -104,14 +107,14 @@
			btnNote.txtInput.FinishInputEvent += () =>
			{
			string oldName = Common.LocalDevice.Current.GetDeviceMacName(listNewDevice[0]);
			if (btnNote.Text.Trim() == string.Empty)
			if (btnNote.Text == string.Empty)
			{
			btnNote.Text = oldName;
			}
			if (oldName != btnNote.Text.Trim())
			if (oldName != btnNote.Text)
			{
			//修改名字
			this.DeviceReName(btnNote.Text.Trim(), false);
			this.DeviceReName(btnNote.Text, false);
			}
			};

			@@ -125,42 +128,60 @@
			//划线
			btnType.AddBottomLine();

			//所属区域
			//安装位置
			var rowBeloneArea = new BelongAreaControl(listview.rowSpace / 2);
			listview.AddChidren(rowBeloneArea);
			rowBeloneArea.InitControl(Language.StringByID(R.MyInternationalizationString.uBelongArea), this.listNewDevice);
			rowBeloneArea.InitControl(Language.StringByID(R.MyInternationalizationString.uInstallationLocation), this.listNewDevice);
			//底线
			rowBeloneArea.AddBottomLine();

			var listCheck = new List<string>();
			rowBeloneArea.SelectRoomEvent += (roomKeys) =>
			{
			//选择未分配时,清空
			if (roomKeys == string.Empty) { listCheck = new List<string>(); }
			foreach (var device in this.listNewDevice)
			{
			//保存这个设备属于哪个区域
			device.DeviceRoomId = roomKeys;
			device.ReSave();
			var room = Room.CurrentRoom.GetRoomByDevice(device);
			if (device is OTADevice)
			{
			//针对单纯只有一个200端点的设备
			continue;
			}
			if (roomKeys == string.Empty)
			{
			//如果选择的是未分配，则它的全部回路无条件全部清空房间
			HdlRoomLogic.Current.ChangedRoom(device, roomKeys);
			continue;
			}
			var room = HdlRoomLogic.Current.GetRoomByDevice(device);
			string mainKeys = LocalDevice.Current.GetDeviceMainKeys(device);
			if (room == null)
			{
			//这里有点特殊,如果回路没有设置有区域的时候,才设置
			listCheck.Add(mainKeys);
			Room.CurrentRoom.ChangedRoom(device, roomKeys);
			HdlRoomLogic.Current.ChangedRoom(device, roomKeys);
			}
			else if (this.deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueFreshAir
			&& device.Type == DeviceType.FreshAir)
			{
			//新风面板的新风设备，则区域跟着模块一起
			HdlRoomLogic.Current.ChangedRoom(device, roomKeys);
			}
			else if (listCheck.Contains(mainKeys) == true)
			{
			//如果这个回路之前都还没有区域,在本界面还没有关闭之前,可以无条件随便变更
			Room.CurrentRoom.ChangedRoom(device, roomKeys);
			HdlRoomLogic.Current.ChangedRoom(device, roomKeys);
			}
			}
			//保存设备房间索引
			Common.LocalDevice.Current.SaveRealDeviceRoomId(this.listNewDevice, roomKeys);
			};

			//添加全部菜单
			this.AddAllMenuRow();

			//初始化桌布完成
			tableContr.FinishInitControl(bodyFrameLayout, this.listview);
			tableContr.FinishInitControl();
			tableContr = null;

			//保存
			@@ -185,6 +206,19 @@
			this.CloseForm();
			}
			};
			//如果当前住宅是虚拟住宅的话,让所有菜单都不能点击
			if (Common.Config.Instance.Home.IsVirtually == true)
			{
			for (int i = 0; i < listview.ChildrenCount; i++)
			{
			var myRow = listview.GetChildren(i) as FrameRowControl;
			if (myRow != null)
			{
			myRow.UseClickStatu = false;
			myRow.CanClick = false;
			}
			}
			}
			}

			#endregion
			@@ -196,11 +230,10 @@
			/// </summary>
			private void AddAllMenuRow()
			{
			bool isHdlDevice = Common.LocalDevice.Current.IsHdlDevice(listNewDevice[0]);
			if (deviceEnumInfo.BeloneType == DeviceBeloneType.A智能门锁)
			{
			//只有是河东的设备的时候
			if (isHdlDevice == true)
			if (deviceEnumInfo.IsHdlDevice == true)
			{
			//添加【用户管理】行
			this.AddUserManageRow();
			@@ -215,25 +248,64 @@
			//添加【室内机设置】行(空调专用)
			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传感器专用)
			this.AddPirSensorWorkModeRow();
			//添加【绑定目标】行(pir传感器专用)
			this.AddPirSensorBindRow();
			//添加【方向与限位】行(开合帘,卷帘专用)
			this.AddDirectionAndLimitRow();
			//添加【手拉控制】行(开合帘专用)
			this.AddHandPullControlRow();
			//添加【按键设置】行(面板专用)
			this.AddPanelSettionRow();
			//添加【功能设置】行
			this.AddFunctionSettionRow();
			//添加【按键设置】行(方悦专用) --这个有可能和面板重叠
			if (this.AddFangyuePanelSettionRow() == false)
			{
			//添加【按键设置】行(面板专用)
			this.AddPanelSettionRow();
			}
			//检测能否显示功能设置的菜单
			if (this.CheckCanShowFunctionSettionRow() == true)
			{
			//添加【功能设置】行
			if (deviceEnumInfo.ConcreteType == DeviceConcreteType.Sensor_PMTwoPointFive)
			{
			//PM传感器
			this.AddFunctionSettionRowPM();
			}
			else
			{
			this.AddFunctionSettionRow();
			}

			}

			//添加【干接点设置】行
			this.AddDryContactSettionRow();
			}
			//添加【功能类型】行(空气开关专用)
			this.AddAirSwitchFunctionTypeRow();
			//添加【通用信息】行
			this.AddGeneralInformationRow();

			if (isHdlDevice == true)
			//添加【空调模块版本(空调专用)】行
			this.AddAirConditionerModelVersionRow();

			if (deviceEnumInfo.IsHdlDevice == true)
			{
			//添加【固件升级】行
			this.AddFirmwareUpdateRow();
			@@ -262,13 +334,54 @@
			//底线
			btnRow.AddBottomLine();
			var doorLock = this.listNewDevice[0] as ZigBee.Device.DoorLock;
			btnRow.ButtonClickEvent += (sender, e) =>
			{
			var userManagement = new Shared.Phone.UserCenter.DoorLock.UserManagement(doorLock);
			Shared.Phone.UserView.HomePage.Instance.AddChidren(userManagement);
			Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
			userManagement.Show();
			};
			btnRow.ButtonClickEvent += async (sender, e) =>
			{
			if (UserCenterResourse.UserInfo.AuthorityNo == 1)
			{
			Action action = null;
			Action actionNone = null;
			action = () =>
			{
			var userManagement = new Shared.Phone.UserCenter.DoorLock.UserManagement(doorLock);
			Shared.Phone.UserView.HomePage.Instance.AddChidren(userManagement);
			Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
			userManagement.Show();
			};
			actionNone = () =>
			{
			Shared.Phone.UserCenter.DoorLock.DoorLockCommonLayout.SecurityRequest(doorLock);
			};
			HdlCheckLogic.Current.CheckSecondarySecurity(action, actionNone);
			}
			else
			{
			CommonPage.Loading.Start("");
			var result = await Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.GetDoorLockOperateAccess(doorLock, Shared.Common.Config.Instance.Guid);
			if (result == false)
			{
			Action action = null;
			Action actionNone = null;
			action = () =>
			{
			var userManagement = new Shared.Phone.UserCenter.DoorLock.UserManagement(doorLock);
			Shared.Phone.UserView.HomePage.Instance.AddChidren(userManagement);
			Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
			userManagement.Show();
			};
			actionNone = () =>
			{
			Shared.Phone.UserCenter.DoorLock.DoorLockCommonLayout.SecurityRequest(doorLock);
			};
			HdlCheckLogic.Current.CheckSecondarySecurity(action, actionNone);

			}
			else
			{
			this.ShowMassage(ShowMsgType.Tip, Language.StringByID(R.MyInternationalizationString.AccountIsFreezed));
			}
			CommonPage.Loading.Hide();
			}
			};
			}
			}

			@@ -294,24 +407,61 @@
			var btnswitch = btnRow.AddMostRightSwitchIcon();
			//底线
			btnRow.AddBottomLine();
			if (string.IsNullOrEmpty(ZigBee.Device.DoorLock.RemoteUnlockPassword) == false)

			var doorLock = (ZigBee.Device.DoorLock)listNewDevice[0];
			if (string.IsNullOrEmpty(doorLock.RemoteUnlockPassword) == false)
			{
			btnswitch.IsSelected = true;
			}

			var doorLock= (ZigBee.Device.DoorLock)listNewDevice[0];
			btnswitch.ButtonClickEvent += (sender, e) =>
			//如果当前住宅是虚拟住宅的话,让所有菜单都不能点击
			if (Common.Config.Instance.Home.IsVirtually == true)
			{
			if (btnswitch.IsSelected == true)
			{
			btnswitch.IsSelected = false;
			ZigBee.Device.DoorLock.RemoteUnlockPassword = string.Empty;
			return;
			}
			var frame = new DoorLock.DoorLockCommonLayout();
			frame.RemotePasswordDialog((ZigBee.Device.DoorLock)listNewDevice[0], btnswitch.btnIcon);
			frame = null;
			};
			btnswitch.CanClick = false;
			}

			btnswitch.ButtonClickEvent += async (sender, e) =>
			{
			if (UserCenterResourse.UserInfo.AuthorityNo == 1)
			{
			if (btnswitch.IsSelected == true)
			{
			btnswitch.IsSelected = false;
			doorLock.RemoteUnlockPassword = string.Empty;
			return;
			}
			var frame = new DoorLock.DoorLockCommonLayout();
			frame.RemotePasswordDialog((ZigBee.Device.DoorLock)listNewDevice[0], btnswitch.btnIcon);
			frame = null;
			}
			else
			{
			var result = await Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.GetDoorLockOperateAccess(doorLock, Shared.Common.Config.Instance.Guid);
			if (result == false)
			{
			var result1 = await Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.GetDoorLockUnlockAccess(doorLock, Shared.Common.Config.Instance.Guid);
			if (result1 == true)
			{
			if (btnswitch.IsSelected == true)
			{
			btnswitch.IsSelected = false;
			doorLock.RemoteUnlockPassword = string.Empty;
			return;
			}
			var frame = new DoorLock.DoorLockCommonLayout();
			frame.RemotePasswordDialog((ZigBee.Device.DoorLock)listNewDevice[0], btnswitch.btnIcon);
			frame = null;
			}
			else
			{
			this.ShowMassage(ShowMsgType.Tip, Language.StringByID(R.MyInternationalizationString.NoAccess));
			}
			}
			else
			{
			this.ShowMassage(ShowMsgType.Tip, Language.StringByID(R.MyInternationalizationString.AccountIsFreezed));
			}
			}
			};
			}
			}

			@@ -337,13 +487,31 @@
			//底线
			btnRow.AddBottomLine();
			var doorLock = this.listNewDevice[0] as ZigBee.Device.DoorLock;
			btnRow.ButtonClickEvent += (sender, e) =>
			{
			var tempPage = new Shared.Phone.UserCenter.DoorLock.TimeSettignPage(doorLock, "DoorLockTime");
			Shared.Phone.UserView.HomePage.Instance.AddChidren(tempPage);
			Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
			tempPage.Show();
			};
			btnRow.ButtonClickEvent += async (sender, e) =>
			{
			if (UserCenterResourse.UserInfo.AuthorityNo == 1)
			{
			var tempPage = new Shared.Phone.UserCenter.DoorLock.TimeSettignPage(doorLock, "DoorLockTime");
			Shared.Phone.UserView.HomePage.Instance.AddChidren(tempPage);
			Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
			tempPage.Show();
			}
			else
			{
			var result = await Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.GetDoorLockOperateAccess(doorLock, Shared.Common.Config.Instance.Guid);
			if (result == false)
			{
			var tempPage = new Shared.Phone.UserCenter.DoorLock.TimeSettignPage(doorLock, "DoorLockTime");
			Shared.Phone.UserView.HomePage.Instance.AddChidren(tempPage);
			Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
			tempPage.Show();
			}
			else
			{
			this.ShowMassage(ShowMsgType.Tip, Language.StringByID(R.MyInternationalizationString.AccountIsFreezed));
			}
			}
			};
			}
			}

			@@ -352,7 +520,7 @@
			#region ■ 按键设置(面板)_____________________

			/// <summary>
			/// 添加【按键设置】行
			/// 添加【按键设置】行(面板)
			/// </summary>
			private void AddPanelSettionRow()
			{
			@@ -375,6 +543,83 @@
			var form = new DevicePanel.PanelButtonSettionForm();
			form.AddForm(listNewDevice[0]);
			};
			}

			#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 ■ 按键设置(方悦)_____________________

			/// <summary>
			/// 添加【按键设置】行(方悦)
			/// </summary>
			private bool AddFangyuePanelSettionRow()
			{
			if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueTwo
			\|\| deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueFour
			\|\| deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueEight
			\|\| deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueEnvironment
			\|\| deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueFreshAir)
			{
			//按键设置
			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) =>
			{
			if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueTwo
			\|\| deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueFour
			\|\| deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueEight)
			{
			//方悦按键面板[单开双控/双开四控/四开八控]配置
			var form = new DevicePanel.PanelFangyueButtonSettionForm();
			form.AddForm(listNewDevice[0]);
			}
			else if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueEnvironment)
			{
			//方悦环境面板的按键配置
			var form = new DevicePanel.PanelFangyueEnvironmentButtonSettionForm();
			form.AddForm(listNewDevice[0]);
			}
			else
			{
			//方悦新风面板的按键配置
			var form = new DevicePanel.PanelFangyueFreshAirButtonSettionForm();
			form.AddForm(listNewDevice[0]);
			}
			};
			return true;
			}
			return false;
			}

			#endregion
			@@ -416,6 +661,36 @@

			#endregion

			#region ■ 工作模式(pir传感器专用)____________

			/// <summary>
			/// 添加【工作模式】行(pir传感器专用)
			/// </summary>
			private void AddPirSensorWorkModeRow()
			{
			if (this.deviceEnumInfo.ConcreteType != DeviceConcreteType.Sensor_Pir
			\|\| deviceEnumInfo.IsHdlDevice == false)
			{
			return;
			}
			//工作模式
			string caption = Language.StringByID(R.MyInternationalizationString.uWorkMode);
			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 DevicePirSensor.PirSensorWorkModeMenuForm();
			form.AddForm((IASZone)this.listNewDevice[0]);
			};
			}

			#endregion;

			#region ■ 绑定目标(pir传感器专用)____________

			/// <summary>
			@@ -452,6 +727,37 @@
			/// </summary>
			private void AddFunctionSettionRow()
			{
			//只有回路数大于1才能有这个菜单
			if (Common.LocalDevice.Current.GetDevicesCountByMac(listNewDevice[0].DeviceAddr) == 1)
			{
			//新风小模块只有一个回路，但要求新风小模块的新风有功能设置
			if (deviceEnumInfo.ConcreteType != DeviceConcreteType.Relay_FangyueFreshAirModul)
			{
			return;
			}
			}
			if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueEnvironment
			\|\| deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueFreshAir)
			{
			//环境面板没有功能设置
			return;
			}

			//2020.03.06新追加：如果全部都是干接点的话,也不能有这个东西
			int dryContactCount = 0;
			for (int i = 0; i < listNewDevice.Count; i++)
			{
			if (listNewDevice[i].Type == DeviceType.OnOffSwitch)
			{
			dryContactCount++;
			}
			}
			if (listNewDevice.Count == dryContactCount)
			{
			//这个设备全是干接点
			return;
			}

			//功能设置
			string caption = Language.StringByID(R.MyInternationalizationString.uFunctionSettingUp);
			var btnFunction = new FrameRowControl(listview.rowSpace / 2);
			@@ -463,8 +769,16 @@
			btnFunction.AddBottomLine();
			btnFunction.ButtonClickEvent += (sender, e) =>
			{
			//方悦面板
			if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueTwo
			\|\| deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueFour
			\|\| deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueEight)
			{
			var form = new DevicePanel.PanelFangyueFunctionSettionForm();
			form.AddForm(listNewDevice[0], deviceEnumInfo);
			}
			//河东的面板设备
			if (deviceEnumInfo.BeloneType == DeviceBeloneType.A按键面板 && deviceEnumInfo.IsHdlDevice == true)
			else if (deviceEnumInfo.BeloneType == DeviceBeloneType.A按键面板 && deviceEnumInfo.IsHdlDevice == true)
			{
			var form = new DevicePanel.PanelFunctionSettionForm();
			form.AddForm(listNewDevice[0]);
			@@ -474,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);
			};
			}

			@@ -551,19 +886,26 @@
			var btnSwitch = btnFunction.AddMostRightSwitchIcon();
			//底线
			btnFunction.AddBottomLine();
			btnSwitch.ButtonClickEvent += async (sender, e) =>
			btnSwitch.ButtonClickEvent += (sender, e) =>
			{
			//切换模式
			var result = await HdlDeviceCurtainLogic.Current.SetHandPullControl(deviceCurtain, !btnSwitch.IsSelected);
			bool statu = !btnSwitch.IsSelected;
			var result = HdlDeviceCurtainLogic.Current.SetHandPullControl(deviceCurtain, statu);
			if (result == true)
			{
			btnSwitch.IsSelected = !btnSwitch.IsSelected;
			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]);
			HdlDeviceAttributeLogic.Current.AddAttributeEvent("HandPullControl", "DeviceStatusReport", (device) =>
			HdlGatewayReceiveLogic.Current.AddAttributeEvent("HandPullControl", ReceiveComandDiv.A设备属性上报, (device) =>
			{
			string checkKey = LocalDevice.Current.GetDeviceMainKeys(device);
			if (mainkeys != checkKey \|\| device.DeviceStatusReport.CluterID != 258)
			@@ -577,7 +919,10 @@
			//手拉控制
			if (0 < (attriBute.AttriButeData & 0x04))
			{
			btnSwitch.IsSelected = true;
			HdlThreadLogic.Current.RunMain(() =>
			{
			btnSwitch.IsSelected = true;
			});
			}
			}
			}
			@@ -595,10 +940,12 @@
			/// </summary>
			private void AddIndoorUnitSettionRow()
			{
			if (this.deviceEnumInfo.ConcreteType != DeviceConcreteType.AirConditioner_ZbGateway)
			if (this.deviceEnumInfo.ConcreteType != DeviceConcreteType.AirConditioner_ZbGateway
			\|\| this.listNewDevice[0] is OTADevice)//追加：单纯只有200端点的话，不显示这个菜单
			{
			return;
			}

			//室内机设置
			string caption = Language.StringByID(R.MyInternationalizationString.uIndoorUnitSettion);
			var btnFunction = new FrameRowControl(listview.rowSpace / 2);
			@@ -613,6 +960,142 @@
			var form = new DeviceAirConditioner.IndoorUnitListForm();
			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 ■ 功能类型(空气开关专用)_____________

			/// <summary>
			/// 添加【功能类型】行(空气开关专用)
			/// </summary>
			private void AddAirSwitchFunctionTypeRow()
			{
			//2020.04.28变更:有个别设备它除了继电器回路，什么都没有了,
			//这个时候也要现实出来
			if (this.listNewDevice.Count != 1)
			{
			return;
			}
			if (this.listNewDevice[0].Type != DeviceType.OnOffOutput
			&& this.listNewDevice[0].Type != DeviceType.AirSwitch)
			{
			return;
			}
			//自定义功能类型控件
			var rowFunction = new DeviceFunctionTypeRowControl(this.listNewDevice[0], listview.rowSpace / 2);
			listview.AddChidren(rowFunction);
			rowFunction.InitControl();
			//底线
			rowFunction.AddBottomLine();
			}

			#endregion
			@@ -637,6 +1120,34 @@
			var form = new DeviceGeneralInformationForm();
			form.AddForm(listNewDevice[0].DeviceAddr);
			};
			}

			#endregion

			#region ■ 空调模块版本(空调专用)_____________

			/// <summary>
			/// 添加【空调模块版本】行(河东的中央空调)
			/// </summary>
			private void AddAirConditionerModelVersionRow()
			{
			if (this.deviceEnumInfo.ConcreteType != DeviceConcreteType.AirConditioner_ZbGateway)
			{
			//不是中央空调
			return;
			}
			string caption = Language.StringByID(R.MyInternationalizationString.uAirConditionerModelVersion);
			var rowVersion = new FrameRowControl(listview.rowSpace / 2);
			rowVersion.UseClickStatu = false;
			listview.AddChidren(rowVersion);
			rowVersion.AddLeftCaption(caption, 600);
			//版本
			this.btnAirConditionerVersion = rowVersion.AddMostRightView("", 800);
			//底线
			rowVersion.AddBottomLine();

			//获取中央空调模块的版本
			this.ReadAirConditionerVersion();
			}

			#endregion
			@@ -670,18 +1181,32 @@
			btnNewVersion.UnSelectedImagePath = "Item/NewVersion.png";
			btnNewVersion.Visible = false;
			btnNewVersion.X = Application.GetRealWidth(242);
			btnNewVersion.Y= Application.GetRealHeight(23);
			rowUpDate.AddChidren(btnNewVersion, ChidrenBindMode.BindEventOnly);
			btnNewVersion.Y = Application.GetRealHeight(23);
			rowUpDate.AddChidren(btnNewVersion, ChidrenBindMode.BindEvent);

			rowUpDate.ButtonClickEvent += (sender, e) =>
			{
			if (this.deviceEnumInfo.ConcreteType != DeviceConcreteType.AirConditioner_ZbGateway)
			{
			//这个是一般设备的升级
			var form = new DeviceFirmwareUpdateForm();
			form.AddForm(listNewDevice[0].DeviceAddr);
			}
			else
			{
			//中央空调的升级的话，是特殊的
			var form = new DeviceAirConditioner.ACZbGatewayUpdateMenuForm();
			form.AddForm(listNewDevice[0], btnNewVersion.Visible);
			}
			btnNewVersion.Visible = false;
			var form = new DeviceFirmwareInfoForm();
			form.AddForm(listNewDevice[0].DeviceAddr);
			};

			//设置设备的版本信息
			this.SetDeviceVersionInfo(btnNewVersion, oTADevice);
			//如果当前住宅不是虚拟住宅
			if (Common.Config.Instance.Home.IsVirtually == false)
			{
			//设置设备的版本信息
			this.SetDeviceVersionInfo(btnNewVersion, oTADevice);
			}
			}

			/// <summary>
			@@ -740,17 +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)
			{
			//开启进度条
			this.ShowProgressBar();

			//修改MAC名
			string deviceName = i_deviceName.Trim();
			var result = await Common.LocalDevice.Current.ReMacName(this.listNewDevice, deviceName);
			//关闭进度条
			this.CloseProgressBar();

			var result = Common.LocalDevice.Current.ReMacName(this.listNewDevice, deviceName);
			if (result == false)
			{
			return;
			@@ -793,15 +1312,11 @@
			/// </summary>
			private void ShowTopRightMenu()
			{
			int menuCount = 1;
			string deviceMenu = string.Empty;
			//检测此回路是否拥有定位功能(拿端点最小的那个回路去定位)
			bool canTest = Common.LocalDevice.Current.DeviceIsCanFixedPosition(listNewDevice[0]);
			if (canTest == true)
			{
			menuCount = 2;
			}
			var frame = new TopRightMenuControl(menuCount);

			var frame = new TopRightMenuControl(canTest == true ? 2 : 1, 1);
			string deviceMenu = string.Empty;
			if (canTest == true)
			{
			//定位
			@@ -817,6 +1332,11 @@
			deviceMenu = Language.StringByID(R.MyInternationalizationString.uDelete);
			frame.AddRowMenu(deviceMenu, "Item/DeleteIcon2.png", "Item/DeleteIcon2Selected.png", () =>
			{
			//如果当前住宅是虚拟住宅,此功能无效
			if (Common.Config.Instance.Home.IsVirtually == true)
			{
			return;
			}
			//确认删除该设备及功能？
			string msg = Language.StringByID(R.MyInternationalizationString.uDeleteDeviceMsg);
			this.ShowMassage(ShowMsgType.Confirm, msg, () =>
			@@ -831,24 +1351,26 @@
			/// <summary>
			/// 删除指定设备
			/// </summary>
			private async void DoDeleteDevice()
			private void DoDeleteDevice()
			{
			//开启进度条
			this.ShowProgressBar();
			//删除设备
			bool result = await Common.LocalDevice.Current.DeleteDevice(listNewDevice);

			this.CloseProgressBar();

			if (result == false)
			HdlThreadLogic.Current.RunThread(async () =>
			{
			return;
			}
			//打开进度条
			this.ShowProgressBar();

			Application.RunOnMainThread(() =>
			{
			//关闭界面
			this.CloseForm();
			//删除设备
			bool result = await Common.LocalDevice.Current.DeleteDevice(listNewDevice);
			//关闭进度条
			this.CloseProgressBar();
			if (result == false)
			{
			return;
			}
			HdlThreadLogic.Current.RunMain(() =>
			{
			//关闭界面
			this.CloseForm();
			});
			});
			}
			#endregion
			@@ -858,13 +1380,19 @@
			/// <summary>
			/// 画面关闭
			/// </summary>
			public override void CloseForm()
			public override void CloseFormBefore()
			{
			HdlDeviceAttributeLogic.Current.RemoveEvent("HandPullControl");
			HdlGatewayReceiveLogic.Current.RemoveEvent("HandPullControl");
			//移除获取设备硬件信息的监听线程
			HdlDeviceHardInfoLogic.Current.RemoveDeviceHardInfoThread(listNewDevice[0]);

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

			base.CloseFormBefore();
			}

			#endregion
			@@ -895,8 +1423,72 @@

			#endregion

			#region ■ 界面重新激活事件___________________

			/// <summary>
			/// 自身的上层界面关闭后,它自身处于最上层时,触发的事件
			/// </summary>
			public override int FormActionAgainEvent()
			{
			//重新获取中央空调模块的版本
			this.ReadAirConditionerVersion();

			return 0;
			}

			#endregion

			#region ■ 一般方法___________________________

			/// <summary>
			/// 获取中央空调模块的版本
			/// </summary>
			private void ReadAirConditionerVersion()
			{
			if (this.btnAirConditionerVersion == null)
			{
			return;
			}
			//获取中....
			this.btnAirConditionerVersion.TextID = R.MyInternationalizationString.uGetting;
			HdlThreadLogic.Current.RunThread(async () =>
			{
			//读取空调模块版本
			var result = await HdlDeviceAirConditionerLogic.Current.ReadACFirewareVersionAsync(listNewDevice[0]);
			if (result == null \|\| result.readACFirewareVersionResponData == null \|\| result.readACFirewareVersionResponData.Status != 0)
			{
			HdlThreadLogic.Current.RunMain(() =>
			{
			//获取失败
			btnAirConditionerVersion.TextID = R.MyInternationalizationString.uGettingFail;
			});
			}
			else
			{
			HdlThreadLogic.Current.RunMain(() =>
			{
			btnAirConditionerVersion.Text = result.readACFirewareVersionResponData.FirewareVersion.Replace("-", string.Empty);
			});
			}
			});
			}

			/// <summary>
			/// 检测能否显示功能设置的菜单
			/// </summary>
			/// <returns></returns>
			private bool CheckCanShowFunctionSettionRow()
			{
			//方悦新风面板没有功能设置
			if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueFreshAir
			\|\| deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FourButtonScene
			\|\| deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_TwoButtonCurtain)
			{
			return false;
			}
			return true;
			}

			#endregion
			}
			}