~wjc/HomeApp.git

			@@ -36,19 +36,19 @@
			/// </summary>
			private NormalViewControl btnAirConditionerVersion = null;
			/// <summary>
			/// 简约面板绑定的温度目标名字
			/// 简约多功能面板绑定的温度目标名字
			/// </summary>
			private string bindTemperatureName = string.Empty;
			/// <summary>
			/// 简约面板绑定的湿度目标名字
			/// 简约多功能面板绑定的湿度目标名字
			/// </summary>
			private string bindHumidityName = string.Empty;
			/// <summary>
			/// 简约面板绑定被绑目标是温度
			/// 简约多功能面板绑定被绑目标是温度
			/// </summary>
			private CommonDevice bindTemperatureDev;
			/// <summary>
			/// 简约面板绑定被绑目标是湿度
			/// 简约多功能面板绑定被绑目标是湿度
			/// </summary>
			private CommonDevice bindHumidityDev;
			/// <summary>
			@@ -56,10 +56,13 @@
			/// </summary>
			private string deviceMacTemp = string.Empty;
			// <summary>
			/// 简约面板中被绑定的温湿度目标列表
			/// 简约多功能面板中被绑定的温湿度目标列表
			/// </summary>
			private List<BindObj.BindListResponseObj> bindList = new List<BindObj.BindListResponseObj>();
			#endregion
			/// <summary>
			/// 简约多功能面板的接近感应数据
			private Panel.PanelProximitySensorInfo proximitySensorsInfo = new Panel.PanelProximitySensorInfo();
			#endregion

			#region ■ 初始化_____________________________

			@@ -69,11 +72,11 @@
			/// <param name="deviceMac">设备mac地址</param>
			public void ShowForm(string deviceMac)
			{
			this.listNewDevice = Common.LocalDevice.Current.GetDevicesByMac(deviceMac);
			this.listNewDevice = HdlDeviceCommonLogic.Current.GetDevicesByMac(deviceMac);
			if (listNewDevice.Count == 0)
			{
			//针对单纯只有一个200端点的设备
			listNewDevice.Add(Common.LocalDevice.Current.GetOTADevice(deviceMac));
			listNewDevice.Add(HdlDeviceCommonLogic.Current.GetOTADevice(deviceMac));
			}
			this.listDeviceType.Clear();
			deviceMacTemp = deviceMac;
			@@ -83,33 +86,49 @@
			this.listDeviceType.Add(device.Type);
			}
			//获取这一堆设备时属于什么类型的
			this.deviceEnumInfo = Common.LocalDevice.Current.GetMyDeviceEnumInfo(listNewDevice);
			this.deviceEnumInfo = HdlDeviceCommonLogic.Current.GetMyDeviceEnumInfo(listNewDevice);

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

			//初始化右上角菜单
			this.InitTopRightMenu();
			//重新获取硬件信息(false:不需要获取,true:需要获取)
			var result = this.RefreshHardFirmwareInfo();

			//初始化中部控件
			this.InitMiddleFrame();

			//重新获取硬件信息
			this.RefreshHardFirmwareInfo();

			//简约多功能面板获取绑定目标的显示
			if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_SimpleMultifunction)
			HdlThreadLogic.Current.RunThread(() =>
			{
			//简约面板随便一个回路来获取设备信息
			var dev = Common.LocalDevice.Current.GetDevice(deviceMac, 62);
			if (dev != null)
			if (result == true)
			{
			var key = new ZigBee.Device.Panel();
			key.DeviceAddr = deviceMac;
			key.CurrentGateWayId = dev.CurrentGateWayId;
			InitBindInfo(key);
			//如果需要重新去读取设备的信息才能显示界面的话,等待一段时间
			this.ShowProgressBar();
			System.Threading.Thread.Sleep(1500);
			}
			}
			HdlThreadLogic.Current.RunMain(() =>
			{
			//初始化右上角菜单
			this.InitTopRightMenu();

			//初始化中部控件
			this.InitMiddleFrame();

			//简约多功能面板获取绑定目标的显示
			if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_SimpleMultifunction)
			{
			//简约面板随便一个回路来获取设备信息
			var dev = HdlDeviceCommonLogic.Current.GetDevice(deviceMac, 62);
			if (dev != null)
			{
			var key = new ZigBee.Device.Panel();
			key.DeviceAddr = deviceMac;
			key.CurrentGateWayId = dev.CurrentGateWayId;
			InitBindInfo(key);
			}
			}
			if (result == true)
			{
			this.CloseProgressBar();
			}
			});
			});
			}

			/// <summary>
			@@ -137,21 +156,27 @@

			//设备备注
			string caption = Language.StringByID(R.MyInternationalizationString.uDeviceNote);
			string deviceName = Common.LocalDevice.Current.GetDeviceMacName(listNewDevice[0]);
			string deviceName = HdlDeviceCommonLogic.Current.GetDeviceMacName(listNewDevice[0]);
			var btnNote = new FrameCaptionInputControl(caption, deviceName, listview.rowSpace / 2);
			btnNote.txtInput.MaxByte = 48;//限制只能输入48个字节
			listview.AddChidren(btnNote);
			btnNote.InitControl();
			//划线
			btnNote.AddBottomLine();
			btnNote.txtInput.FinishInputEvent += () =>
			{
			string oldName = Common.LocalDevice.Current.GetDeviceMacName(listNewDevice[0]);
			string oldName = HdlDeviceCommonLogic.Current.GetDeviceMacName(listNewDevice[0]);
			if (btnNote.Text == string.Empty)
			{
			btnNote.Text = oldName;
			}
			if (oldName != btnNote.Text)
			{
			//查看模板时,不允许编辑
			if (Common.Config.Instance.Home.IsShowTemplate == true)
			{
			return;
			}
			//修改名字
			this.DeviceReName(btnNote.Text, false);
			}
			@@ -159,7 +184,7 @@

			//设备类型
			caption = Language.StringByID(R.MyInternationalizationString.uDeviceType);
			deviceName = Common.LocalDevice.Current.GetDeviceObjectText(listNewDevice);
			deviceName = HdlDeviceCommonLogic.Current.GetDeviceObjectText(listNewDevice);
			var btnType = new FrameCaptionViewControl(caption, deviceName, listview.rowSpace / 2);
			btnType.UseClickStatu = false;
			listview.AddChidren(btnType);
			@@ -173,6 +198,11 @@
			rowBeloneArea.InitControl(Language.StringByID(R.MyInternationalizationString.uInstallationLocation), this.listNewDevice);
			//底线
			rowBeloneArea.AddBottomLine();
			//查看模板时,不允许编辑
			if (Common.Config.Instance.Home.IsShowTemplate == true)
			{
			rowBeloneArea.CanClick = false;
			}

			var listCheck = new List<string>();
			rowBeloneArea.SelectRoomEvent += (roomKeys) =>
			@@ -193,7 +223,7 @@
			continue;
			}
			var room = HdlRoomLogic.Current.GetRoomByDevice(device);
			string mainKeys = LocalDevice.Current.GetDeviceMainKeys(device);
			string mainKeys = HdlDeviceCommonLogic.Current.GetDeviceMainKeys(device);
			if (room == null)
			{
			//这里有点特殊,如果回路没有设置有区域的时候,才设置
			@@ -213,7 +243,7 @@
			}
			}
			//保存设备房间索引
			Common.LocalDevice.Current.SaveRealDeviceRoomId(this.listNewDevice, roomKeys);
			HdlRoomLogic.Current.SaveRealDeviceRoomId(this.listNewDevice, roomKeys);
			};

			//添加全部菜单
			@@ -229,7 +259,7 @@
			bodyFrameLayout.AddChidren(btnFinish);
			btnFinish.ButtonClickEvent += (sender, e) =>
			{
			string oldName = Common.LocalDevice.Current.GetDeviceMacName(listNewDevice[0]);
			string oldName = HdlDeviceCommonLogic.Current.GetDeviceMacName(listNewDevice[0]);
			if (btnNote.Text.Trim() == string.Empty)
			{
			btnNote.Text = oldName;
			@@ -245,8 +275,8 @@
			this.CloseForm();
			}
			};
			//如果当前住宅是虚拟住宅的话,让所有菜单都不能点击
			if (Common.Config.Instance.Home.IsVirtually == true)
			//查看模板时,不允许编辑
			if (Common.Config.Instance.Home.IsShowTemplate == true)
			{
			for (int i = 0; i < listview.ChildrenCount; i++)
			{
			@@ -289,11 +319,13 @@
			}
			else if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_SimpleMultifunction)
			{
			//简约多功能面板
			//简约多功能面板
			this.AddIBindRow(deviceMacTemp);
			this.AddFunctionSettionRow();
			this.AddProximitySensorsRow(deviceMacTemp);
			this.AddFunctionSettionRow();
			this.AddHumiditySourceRow(deviceMacTemp);
			this.AddTemperatureSensorRow(deviceMacTemp);
			this.DataCorrectionRow(deviceMacTemp);
			}
			else if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_SimpleEnvironment)
			{
			@@ -374,7 +406,7 @@
			var doorLock = this.listNewDevice[0] as ZigBee.Device.DoorLock;
			btnRow.ButtonClickEvent += async (sender, e) =>
			{
			if (UserCenterResourse.UserInfo.AuthorityNo == 1)
			if (HdlUserCenterResourse.ResidenceOption.AuthorityNo == 1)
			{
			Action action = null;
			Action actionNone = null;
			@@ -459,7 +491,7 @@

			btnswitch.ButtonClickEvent += async (sender, e) =>
			{
			if (UserCenterResourse.UserInfo.AuthorityNo == 1)
			if (HdlUserCenterResourse.ResidenceOption.AuthorityNo == 1)
			{
			if (btnswitch.IsSelected == true)
			{
			@@ -527,7 +559,7 @@
			var doorLock = this.listNewDevice[0] as ZigBee.Device.DoorLock;
			btnRow.ButtonClickEvent += async (sender, e) =>
			{
			if (UserCenterResourse.UserInfo.AuthorityNo == 1)
			if (HdlUserCenterResourse.ResidenceOption.AuthorityNo == 1)
			{
			var tempPage = new Shared.Phone.UserCenter.DoorLock.TimeSettignPage(doorLock, "DoorLockTime");
			Shared.Phone.UserView.HomePage.Instance.AddChidren(tempPage);
			@@ -602,7 +634,7 @@
			btnFunction.ButtonClickEvent += (sender, e) =>
			{
			//简约环境面板的按键配置
			var form = new DevicePanel.PanelSimpleEnvironmentButtonSettionForm();
			var form = new DevicePanel.PanelSettionWithSourceForm();
			form.AddForm(listNewDevice[0]);
			};
			}
			@@ -643,16 +675,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
			@@ -772,7 +798,7 @@
			private void AddFunctionSettionRow()
			{
			//只有回路数大于1才能有这个菜单
			if (Common.LocalDevice.Current.GetDevicesCountByMac(listNewDevice[0].DeviceAddr) == 1)
			if (HdlDeviceCommonLogic.Current.GetDevicesCountByMac(listNewDevice[0].DeviceAddr) == 1)
			{
			//新风小模块只有一个回路，但要求新风小模块的新风有功能设置
			if (deviceEnumInfo.ConcreteType != DeviceConcreteType.Relay_FangyueFreshAirModul)
			@@ -821,14 +847,19 @@
			var form = new DevicePanel.PanelFangyueFunctionSettionForm();
			form.AddForm(listNewDevice[0], deviceEnumInfo);
			}
			//简约环境面板的按键配置
			//简约多功能面板的按键配置
			else if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_SimpleMultifunction)
			{
			var form = new DeviceFunctionSettionForm();
			if (listNewDevice.Count > 62)
			foreach (var dev in listNewDevice)
			{
			form.AddForm(listNewDevice[62], true);
			if (dev.Type == DeviceType.OnOffOutput && dev.DeviceEpoint == 62)
			{
			var form = new DeviceFunctionSettionForm();
			form.AddForm(dev, true);
			break;
			}
			}

			}
			//河东的面板设备
			else if (deviceEnumInfo.BeloneType == DeviceBeloneType.A按键面板 && deviceEnumInfo.IsHdlDevice == true)
			@@ -949,18 +980,25 @@
			btnSwitch.IsSelected = statu;
			}
			};
			//查看模板时,不允许编辑
			if (Common.Config.Instance.Home.IsShowTemplate == true)
			{
			btnSwitch.CanClick = false;
			btnSwitch.IsSelected = HdlTemplateDeviceDataLogic.Current.GetCurtainHandPullControl(deviceCurtain);
			return;
			}
			//如果是虚拟住宅
			if (Common.Config.Instance.Home.IsVirtually == true)
			{
			btnSwitch.IsSelected = ModelData.DeviceModelDataLogic.Current.GetCurtainHandPullControl(deviceCurtain);
			btnSwitch.IsSelected = HdlTemplateDeviceDataLogic.Current.GetCurtainHandPullControl(deviceCurtain);
			return;
			}

			//添加属性上报监听
			string mainkeys = LocalDevice.Current.GetDeviceMainKeys(this.listNewDevice[0]);
			string mainkeys = HdlDeviceCommonLogic.Current.GetDeviceMainKeys(this.listNewDevice[0]);
			HdlGatewayReceiveLogic.Current.AddAttributeEvent("HandPullControl", ReceiveComandDiv.A设备属性上报, (device) =>
			{
			string checkKey = LocalDevice.Current.GetDeviceMainKeys(device);
			string checkKey = HdlDeviceCommonLogic.Current.GetDeviceMainKeys(device);
			if (mainkeys != checkKey \|\| device.DeviceStatusReport.CluterID != 258)
			{
			return;
			@@ -1016,7 +1054,7 @@
			}
			#endregion

			#region ■ 简约多功能面板用___________________
			#region ■ 简约多功能面板用___________________
			/// <summary>
			/// 添加【绑定目标】行
			/// </summary>
			@@ -1032,12 +1070,88 @@
			btnBindTargets.AddBottomLine();
			btnBindTargets.ButtonClickEvent += (sender, e) =>
			{
			var simpleMutilfunctionTargetsPage = new Shared.Phone.UserCenter.DeviceBind.PanelSimpleMutilfunctionTargetsForm(deviceMac);
			Shared.Phone.UserView.HomePage.Instance.AddChidren(simpleMutilfunctionTargetsPage);
			Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
			simpleMutilfunctionTargetsPage.Show();
			var dev = HdlDeviceCommonLogic.Current.GetDevice(deviceMac, 32);//简约面板随便一个按键来获取设备
			if (dev != null)
			{
			var curControlDev = dev as Panel;
			var simpleMutilfunctionTargetsPage = new Shared.Phone.UserCenter.DeviceBind.PanelSimpleMutilfunctionTargetsForm(curControlDev);
			Shared.Phone.UserView.HomePage.Instance.AddChidren(simpleMutilfunctionTargetsPage);
			Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
			simpleMutilfunctionTargetsPage.Show();
			}
			};
			}

			#region ■ 接近感应___________________________

			/// <summary>
			/// 接近感应行
			/// </summary>
			private void AddProximitySensorsRow(string deviceMac)
			{
			string proximity = Language.StringByID(R.MyInternationalizationString.ProximitySensors);
			var proximitySensors = new FrameRowControl(listview.rowSpace / 2);
			listview.AddChidren(proximitySensors);
			proximitySensors.AddLeftCaption(proximity, 400);

			//接近感应
			proximitySensors.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.ProximitySensors), 400);
			//开关控件
			var btnSwitch = proximitySensors.AddMostRightSwitchIcon();
			//底线
			proximitySensors.AddBottomLine();

			btnSwitch.ButtonClickEvent +=async (sender, e) =>
			{
			btnSwitch.IsSelected = !btnSwitch.IsSelected;
			proximitySensorsInfo.enable = btnSwitch.IsSelected;

			//简约面板随便一个回路来获取设备信息
			var dev = HdlDeviceCommonLogic.Current.GetDevice(deviceMac, 62);
			if (dev != null)
			{
			var key = new ZigBee.Device.Panel();
			key.DeviceAddr = deviceMac;
			key.CurrentGateWayId = dev.CurrentGateWayId;
			SetProximitySensor(key);
			}
			};
			if (proximitySensorsInfo.enable == true)
			{
			btnSwitch.IsSelected = true;
			}
			}
			#endregion

			#region ■ 数据矫正_________________________
			/// <summary>
			/// 数据矫正行
			/// </summary>
			private void DataCorrectionRow(string deviceMac)
			{
			//数据矫正
			var rowLight = new FrameRowControl(listview.rowSpace / 2);
			listview.AddChidren(rowLight);
			rowLight.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.DataCorrection), 600);
			//底线
			rowLight.AddBottomLine();
			//右箭头
			rowLight.AddRightArrow();
			rowLight.ButtonClickEvent += (sender, e) =>
			{
			var dev = HdlDeviceCommonLogic.Current.GetDevice(deviceMac, 62);//简约面板随便一个回路来获取设备
			var device = new CommonDevice();
			if (dev != null)
			{
			device.CurrentGateWayId = dev.CurrentGateWayId;
			}
			device.DeviceAddr = deviceMac;
			device.DeviceEpoint = 65;
			var form = new Shared.Phone.UserCenter.DevicePanel.DataCorrectionForm();
			form.AddForm(device);
			};
			}
			#endregion

			/// <summary>
			/// 湿度来源行
			@@ -1061,7 +1175,7 @@
			rowHumidity.ButtonClickEvent += (sender, e) =>
			{

			var dev = Common.LocalDevice.Current.GetDevice(deviceMac, 62);//简约面板随便一个回路来获取设备
			var dev = HdlDeviceCommonLogic.Current.GetDevice(deviceMac, 62);//简约面板随便一个回路来获取设备
			var device = new CommonDevice();
			if (dev != null)
			{
			@@ -1069,7 +1183,7 @@
			}
			device.Type = DeviceType.OnOffSwitch;
			device.DeviceAddr = deviceMac;
			device.DeviceEpoint = 65;//能绑定湿度的回路
			device.DeviceEpoint = 1;//能绑定湿度的回路
			var paneTargetsBaseFormp = new PaneTargetsBaseForm(device, bindHumidityDev, BindInfo.BindType.Humidity);
			Shared.Phone.UserView.HomePage.Instance.AddChidren(paneTargetsBaseFormp);
			Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
			@@ -1112,7 +1226,7 @@
			var btnTemperatureStatu = rowTemPerature.AddMostRightView(msg, 700);
			rowTemPerature.ButtonClickEvent += (sender, e) =>
			{
			var dev = Common.LocalDevice.Current.GetDevice(deviceMac, 62);//简约面板随便一个回路来获取设备
			var dev = HdlDeviceCommonLogic.Current.GetDevice(deviceMac, 62);//简约面板随便一个回路来获取设备
			var device = new CommonDevice();
			if (dev != null)
			{
			@@ -1120,7 +1234,7 @@
			}
			device.Type = DeviceType.OnOffSwitch;
			device.DeviceAddr = deviceMac;
			device.DeviceEpoint = 64;//能绑定温度的回路
			device.DeviceEpoint = 1;//能绑定温度的回路
			var paneTargetsBaseFormp = new PaneTargetsBaseForm(device, bindTemperatureDev, BindInfo.BindType.Temperature);
			Shared.Phone.UserView.HomePage.Instance.AddChidren(paneTargetsBaseFormp);
			Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
			@@ -1143,7 +1257,7 @@
			}

			/// <summary>
			///读温湿度数据
			///初始化数据
			/// </summary>
			void InitBindInfo(CommonDevice curControlDev)
			{
			@@ -1155,8 +1269,8 @@
			{
			CommonPage.Loading.Start("");
			});
			//1、获去绑定的温度传感器
			curControlDev.DeviceEpoint = 64;
			//读温湿度数据
			curControlDev.DeviceEpoint = 1;
			var result = await GetBindName(curControlDev);
			if (!result)
			{
			@@ -1166,17 +1280,16 @@
			});
			return;
			}

			//2、获去绑定的湿度度传感器
			curControlDev.DeviceEpoint = 65;
			var result2 = await GetBindName(curControlDev);
			if (!result2)

			//2、获设备接近感应初始数据
			//接近感应(他们说随便拿一路回路就行了)
			proximitySensorsInfo = await HdlDevicePanelLogic.Current.GetDeviceProximitySensorsSettion(curControlDev);
			if (proximitySensorsInfo == null)
			{
			Application.RunOnMainThread(() =>
			{
			new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime) + "(" + "5007_3" + ")", Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);
			});
			return;
			proximitySensorsInfo = new Panel.PanelProximitySensorInfo();
			//关闭进度条
			this.CloseProgressBar(ShowReLoadMode.YES);
			return ;
			}
			}
			catch (Exception ex)
			@@ -1187,6 +1300,8 @@
			{
			Application.RunOnMainThread(() =>
			{
			//初始化右上角菜单
			this.InitTopRightMenu();
			//初始化中部控件
			this.InitMiddleFrame();
			CommonPage.Loading.Hide();
			@@ -1209,7 +1324,7 @@
			bindList = panelBindListRes.getAllBindResponseData.BindList;
			foreach (var bDev in bindList)
			{
			var device = Common.LocalDevice.Current.GetDevice(bDev.BindMacAddr, bDev.BindEpoint);
			var device = HdlDeviceCommonLogic.Current.GetDevice(bDev.BindMacAddr, bDev.BindEpoint);
			if (device == null)
			{
			continue;
			@@ -1219,41 +1334,18 @@
			var bD = device as TemperatureSensor;
			if (bD.SensorDiv == 1 && bDev.BindCluster == 1026)
			{
			if (string.IsNullOrEmpty(bDev.ESName))
			{
			bindTemperatureName = Common.LocalDevice.Current.GetDeviceEpointName(device);
			}
			else
			{
			bindTemperatureName = bDev.ESName;
			}
			bindTemperatureName = HdlDeviceCommonLogic.Current.GetDeviceEpointName(device);
			bindTemperatureDev = device;
			}
			if (bD.SensorDiv == 2 && bDev.BindCluster == 1029)
			{
			if (string.IsNullOrEmpty(bDev.ESName))
			{
			bindHumidityName = Common.LocalDevice.Current.GetDeviceEpointName(device);
			}
			else
			{
			bindHumidityName = bDev.ESName;
			}

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

			bindHumidityName = HdlDeviceCommonLogic.Current.GetDeviceEpointName(device);
			bindHumidityDev = device;
			}
			}
			@@ -1261,6 +1353,44 @@
			}
			return result;
			}

			#region ■ 设置数据___________________________

			/// <summary>
			/// 设置面板接近感应数据
			/// </summary>
			private void SetProximitySensor(CommonDevice curControlDev)
			{
			System.Threading.Tasks.Task.Run(async () =>
			{
			try
			{
			Application.RunOnMainThread(() =>
			{
			CommonPage.Loading.Start("");
			});
			//接近感应(提供设备的同事说随便一个回路就行)
			var result = await HdlDevicePanelLogic.Current.SetProximitySensorStatus(curControlDev, proximitySensorsInfo.enable);
			if (result == false)
			{
			return;
			}
			}
			catch (Exception ex)
			{
			var mess = ex.Message;
			}
			finally
			{
			Application.RunOnMainThread(() =>
			{
			CommonPage.Loading.Hide();
			});
			}
			});
			}

			#endregion
			#endregion

			#region ■ 功能类型(空气开关专用)_____________
			@@ -1287,6 +1417,11 @@
			rowFunction.InitControl();
			//底线
			rowFunction.AddBottomLine();
			//查看模板时,不允许编辑
			if (Common.Config.Instance.Home.IsShowTemplate == true)
			{
			rowFunction.CanClick = false;
			}
			}

			#endregion
			@@ -1333,7 +1468,11 @@
			listview.AddChidren(rowVersion);
			rowVersion.AddLeftCaption(caption, 600);
			//版本
			this.btnAirConditionerVersion = rowVersion.AddMostRightView("", 800);
			this.btnAirConditionerVersion = rowVersion.AddMostRightView(string.Empty, 900);
			if (this.listNewDevice[0] is AC)
			{
			this.btnAirConditionerVersion.Text = ((AC)this.listNewDevice[0]).AcModelVersion;
			}
			//底线
			rowVersion.AddBottomLine();

			@@ -1351,7 +1490,7 @@
			private void AddFirmwareUpdateRow()
			{
			//拥有200端口这个东西的时候，才会显示这一行
			var oTADevice = Common.LocalDevice.Current.GetOTADevice(listNewDevice[0].DeviceAddr);
			var oTADevice = HdlDeviceCommonLogic.Current.GetOTADevice(listNewDevice[0].DeviceAddr);
			if (oTADevice == null)
			{
			return;
			@@ -1393,7 +1532,8 @@
			};

			//如果当前住宅不是虚拟住宅
			if (Common.Config.Instance.Home.IsVirtually == false)
			if (Config.Instance.Home.IsVirtually == false
			&& Config.Instance.Home.IsShowTemplate == false)
			{
			//设置设备的版本信息
			this.SetDeviceVersionInfo(btnNewVersion, oTADevice);
			@@ -1411,10 +1551,22 @@
			{
			bool receiveImageInfo = false;
			//设置设备全部的镜像信息
			HdlDeviceImageInfoLogic.Current.SetAllImageInfoToOtaDevice(oTADevice, (device, reportData) =>
			string checkKey = HdlDeviceCommonLogic.Current.GetDeviceMainKeys(oTADevice.DeviceAddr, oTADevice.DeviceEpoint);
			HdlGatewayReceiveLogic.Current.AddAttributeEvent("SetDeviceVersionInfo", ReceiveComandDiv.A设备属性上报, (report) =>
			{
			receiveImageInfo = true;
			if (report.DeviceStatusReport.CluterID == (int)Cluster_ID.Ota)
			{
			string mainKey = HdlDeviceCommonLogic.Current.GetDeviceMainKeys(report.DeviceAddr, report.DeviceEpoint);
			if (checkKey == mainKey)
			{
			//已经接收得到
			receiveImageInfo = true;
			}
			}
			});
			//发送命令
			HdlDeviceAttributeLogic.Current.ReadDeviceFirmwareVersion(oTADevice);

			int count = 5;
			while (receiveImageInfo == false && count > 0)
			{
			@@ -1423,14 +1575,14 @@
			count--;
			}
			//移除事件
			HdlDeviceImageInfoLogic.Current.RemoveDeviceFirmwareVersionThread(oTADevice);
			HdlGatewayReceiveLogic.Current.RemoveEvent("SetDeviceVersionInfo");

			oTADevice = Common.LocalDevice.Current.GetOTADevice(listNewDevice[0].DeviceAddr);
			oTADevice = HdlDeviceCommonLogic.Current.GetOTADevice(listNewDevice[0].DeviceAddr);
			//添加升级固件信息(成不成功都无所谓)
			var result = HdlFirmwareUpdateLogic.AddFirmwareVersionInfo(FirmwareLevelType.ZigbeeDevice, oTADevice.HwVersion.ToString(), oTADevice.ImgTypeId.ToString());
			var result = HdlFirmwareUpdateLogic.Current.AddFirmwareVersionInfo(FirmwareLevelType.A设备, oTADevice.HwVersion.ToString(), oTADevice.ImgTypeId.ToString());

			//获取设备最新版本
			var deviceFirmware = HdlFirmwareUpdateLogic.GetFirmwareMostVersionInfo(FirmwareLevelType.ZigbeeDevice,
			var deviceFirmware = HdlFirmwareUpdateLogic.Current.GetFirmwareMostVersionInfo(FirmwareLevelType.A设备,
			oTADevice.HwVersion.ToString(),
			oTADevice.ImgTypeId.ToString(),
			oTADevice.ImgVersion);
			@@ -1460,7 +1612,7 @@
			{
			//修改MAC名
			string deviceName = i_deviceName.Trim();
			var result = Common.LocalDevice.Current.ReMacName(this.listNewDevice, deviceName);
			var result = HdlDeviceCommonLogic.Current.ReMacName(this.listNewDevice, deviceName);
			if (result == false)
			{
			return;
			@@ -1487,6 +1639,11 @@
			/// </summary>
			private void InitTopRightMenu()
			{
			//查看模板时,不允许编辑
			if (Common.Config.Instance.Home.IsShowTemplate == true)
			{
			return;
			}
			var btnIcon = new MostRightIconControl(69, 69);
			btnIcon.UnSelectedImagePath = "Item/More.png";
			topFrameLayout.AddChidren(btnIcon);
			@@ -1504,7 +1661,7 @@
			private void ShowTopRightMenu()
			{
			//检测此回路是否拥有定位功能(拿端点最小的那个回路去定位)
			bool canTest = Common.LocalDevice.Current.DeviceIsCanFixedPosition(listNewDevice[0]);
			bool canTest = HdlDeviceCommonLogic.Current.DeviceIsCanFixedPosition(listNewDevice[0]);

			TopRightMenuControl frame = null;

			@@ -1525,7 +1682,7 @@
			frame.AddRowMenu(deviceMenu, "Item/FixedPosition.png", "Item/FixedPositionSelected.png", () =>
			{
			//发送定位功能
			Common.LocalDevice.Current.SetFixedPositionCommand(listNewDevice[0]);
			HdlDeviceCommonLogic.Current.SetFixedPositionCommand(listNewDevice[0], true);
			});
			}

			@@ -1549,7 +1706,7 @@

			//同步
			deviceMenu = Language.StringByID(R.MyInternationalizationString.Synchronization);
			if (Common.LocalDevice.Current.DeviceIsCanFixedPosition(listNewDevice[0]))
			if (HdlDeviceCommonLogic.Current.DeviceIsCanFixedPosition(listNewDevice[0]))
			{
			frame.AddRowMenu(deviceMenu, "", "Item/SynchronizationSelected.png", () =>
			{
			@@ -1577,7 +1734,7 @@
			this.ShowProgressBar();

			//删除设备
			bool result = await Common.LocalDevice.Current.DeleteDevice(listNewDevice);
			bool result = await HdlDeviceCommonLogic.Current.DeleteDevice(listNewDevice);
			//关闭进度条
			this.CloseProgressBar();
			if (result == false)
			@@ -1603,7 +1760,7 @@
			this.ShowProgressBar();

			//同步设备
			bool result = await Common.LocalDevice.Current.SynchronizationDevice(listNewDevice);
			bool result = await HdlDeviceCommonLogic.Current.SynchronizationDevice(listNewDevice);
			//关闭进度条
			this.CloseProgressBar();
			if (result == false)
			@@ -1622,11 +1779,10 @@
			public override void CloseFormBefore()
			{
			HdlGatewayReceiveLogic.Current.RemoveEvent("HandPullControl");
			//移除获取设备硬件信息的监听线程
			HdlDeviceHardInfoLogic.Current.RemoveDeviceHardInfoThread(listNewDevice[0]);
			HdlGatewayReceiveLogic.Current.RemoveEvent("SetDeviceVersionInfo");

			//设备新入网
			if (UserCenterResourse.DicActionForm.ContainsKey("AddDeviceTypeListForm") == true)
			if (HdlFormLogic.Current.IsFormOpen("AddDeviceTypeListForm") == true)
			{
			this.LoadFormMethodByName("DeviceListMainForm", "RefreshDeviceRow", new object[] { listNewDevice[0].DeviceAddr });
			}
			@@ -1639,25 +1795,19 @@
			#region ■ 硬件信息___________________________

			/// <summary>
			/// 重新获取硬件信息
			/// 重新获取硬件信息(false:不需要获取,true:需要获取)
			/// </summary>
			private void RefreshHardFirmwareInfo()
			private bool RefreshHardFirmwareInfo()
			{
			if (listNewDevice[0].DriveCode > 0)
			if (listNewDevice[0].DriveCode > 0 \|\| Common.Config.Instance.Home.IsShowTemplate == true)
			{
			//虚拟设备没有这种操作
			return;
			return false;
			}
			//重新获取硬件信息
			HdlDeviceHardInfoLogic.Current.SetAllHardFirmwareInfoToDevice(listNewDevice[0], (device, reportData) =>
			{
			for (int i = 1; i < listNewDevice.Count; i++)
			{
			//全部回路的信息都是一致的
			HdlDeviceHardInfoLogic.Current.SetHardFirmwareInfo(device.DeviceStatusReport, listNewDevice[i]);
			listNewDevice[i].ReSave();
			}
			});
			HdlDeviceAttributeLogic.Current.ReadDeviceAllHardFirmwareInfo(listNewDevice[0]);
			//获取设备的固定属性
			return HdlDeviceAttributeLogic.Current.ReadDeviceAllFixedAttribute(listNewDevice[0]);
			}

			#endregion
			@@ -1688,27 +1838,48 @@
			{
			return;
			}
			//获取中....
			this.btnAirConditionerVersion.TextID = R.MyInternationalizationString.uGetting;
			//如果是虚拟住宅或者展示模板的话
			if (Config.Instance.Home.IsShowTemplate == true \|\| Config.Instance.Home.IsVirtually == true)
			{
			return;
			}

			bool notVersion = true;
			if (this.listNewDevice[0] is AC)
			{
			notVersion = ((AC)this.listNewDevice[0]).AcModelVersion == string.Empty;
			}
			if (notVersion == true)
			{
			//获取中
			btnAirConditionerVersion.Text = Language.StringByID(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(() =>
			if (notVersion == true)
			{
			//获取失败
			btnAirConditionerVersion.TextID = R.MyInternationalizationString.uGettingFail;
			});
			HdlThreadLogic.Current.RunMain(() =>
			{
			btnAirConditionerVersion.Text = Language.StringByID(R.MyInternationalizationString.uGettingFail);
			});
			}
			return;
			}
			else
			HdlThreadLogic.Current.RunMain(() =>
			{
			HdlThreadLogic.Current.RunMain(() =>
			string strVersion = result.readACFirewareVersionResponData.FirewareVersion.Replace("-", string.Empty);
			if (this.listNewDevice[0] is AC)
			{
			btnAirConditionerVersion.Text = result.readACFirewareVersionResponData.FirewareVersion.Replace("-", string.Empty);
			});
			}
			((AC)this.listNewDevice[0]).AcModelVersion = strVersion;
			this.listNewDevice[0].ReSave();
			}
			btnAirConditionerVersion.Text = strVersion;
			});
			});
			}