~xm/HomeApp.git

old mode 100755 new mode 100644

			@@ -2,6 +2,8 @@
			using System.Collections.Generic;
			using System.Threading.Tasks;
			using Shared.Common;
			using Shared.Phone.UserCenter.Device.Bind;
			using Shared.Phone.UserCenter.DeviceBind;
			using ZigBee.Device;

			namespace Shared.Phone.UserCenter.Device
			@@ -33,8 +35,34 @@
			/// 中央空调的版本控件
			/// </summary>
			private NormalViewControl btnAirConditionerVersion = null;

			#endregion
			/// <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>
			/// 简约面板当前Mac
			/// </summary>
			private string deviceMacTemp = string.Empty;
			// <summary>
			/// 简约多功能面板中被绑定的温湿度目标列表
			/// </summary>
			private List<BindObj.BindListResponseObj> bindList = new List<BindObj.BindListResponseObj>();
			/// <summary>
			/// 简约多功能面板的接近感应数据
			private Panel.PanelProximitySensorInfo proximitySensorsInfo = new Panel.PanelProximitySensorInfo();
			#endregion

			#region ■ 初始化_____________________________

			@@ -50,8 +78,8 @@
			//针对单纯只有一个200端点的设备
			listNewDevice.Add(Common.LocalDevice.Current.GetOTADevice(deviceMac));
			}

			this.listDeviceType.Clear();
			deviceMacTemp = deviceMac;
			foreach (var device in listNewDevice)
			{
			//收集设备类型
			@@ -71,6 +99,20 @@

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

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

			/// <summary>
			@@ -100,6 +142,7 @@
			string caption = Language.StringByID(R.MyInternationalizationString.uDeviceNote);
			string deviceName = Common.LocalDevice.Current.GetDeviceMacName(listNewDevice[0]);
			var btnNote = new FrameCaptionInputControl(caption, deviceName, listview.rowSpace / 2);
			btnNote.txtInput.MaxByte = 48;//限制只能输入48个字节
			listview.AddChidren(btnNote);
			btnNote.InitControl();
			//划线
			@@ -113,6 +156,11 @@
			}
			if (oldName != btnNote.Text)
			{
			//查看模板时,不允许编辑
			if (Common.Config.Instance.Home.IsShowTemplate == true)
			{
			return;
			}
			//修改名字
			this.DeviceReName(btnNote.Text, false);
			}
			@@ -134,6 +182,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) =>
			@@ -174,7 +227,7 @@
			}
			}
			//保存设备房间索引
			Common.LocalDevice.Current.SaveRealDeviceRoomId(this.listNewDevice, roomKeys);
			HdlRoomLogic.Current.SaveRealDeviceRoomId(this.listNewDevice, roomKeys);
			};

			//添加全部菜单
			@@ -206,8 +259,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++)
			{
			@@ -247,6 +300,21 @@
			{
			//添加【室内机设置】行(空调专用)
			this.AddIndoorUnitSettionRow();
			}
			else if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_SimpleMultifunction)
			{
			//简约多功能面板
			this.AddIBindRow(deviceMacTemp);
			this.AddProximitySensorsRow(deviceMacTemp);
			this.AddFunctionSettionRow();
			this.AddHumiditySourceRow(deviceMacTemp);
			this.AddTemperatureSensorRow(deviceMacTemp);
			this.DataCorrectionRow(deviceMacTemp);
			}
			else if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_SimpleEnvironment)
			{
			//添加【绑定目标】行(简约环境面板用)
			this.AddSimplePanelSettionRow();
			}
			else
			{
			@@ -394,7 +462,13 @@
			//底线
			btnRow.AddBottomLine();

			var doorLock = (ZigBee.Device.DoorLock)listNewDevice[0];
			var doorLock = (ZigBee.Device.DoorLock)listNewDevice[0];
			///值为空再去读取本地
			if (string.IsNullOrEmpty(doorLock.RemoteUnlockPassword))
			{
			///读取本地远程开锁密码，看看之前是否配置过
			doorLock.RemoteUnlockPassword = ReadLocalPassword();
			}
			if (string.IsNullOrEmpty(doorLock.RemoteUnlockPassword) == false)
			{
			btnswitch.IsSelected = true;
			@@ -450,7 +524,24 @@
			};
			}
			}

			/// <summary>
			/// 保存远程门锁密码
			/// </summary>
			/// <param name="password">密码</param>
			public void SaveLocalPassword(string password) {
			var bytes = System.Text.Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(password));
			IO.FileUtils.WriteFileByBytes(Config.Instance.HomeId + "_" + Config.Instance.Guid, bytes);
			}
			/// <summary>
			/// 读取远程门锁密码
			/// </summary>
			/// <returns></returns>
			public string ReadLocalPassword()
			{
			var str = System.Text.Encoding.UTF8.GetString(IO.FileUtils.ReadFile(Config.Instance.HomeId + "_" + Config.Instance.Guid));
			//Newtonsoft.Json.JsonConvert.DeserializeObject<对像>(str);
			return str;
			}
			#endregion

			#region ■ 门锁时间(门锁)_____________________
			@@ -531,6 +622,32 @@
			};
			}

			#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 DevicePanel.PanelSettionWithSourceForm();
			form.AddForm(listNewDevice[0]);
			};
			}

			#endregion

			#endregion

			#region ■ 按键设置(方悦)_____________________
			@@ -565,16 +682,15 @@
			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();
			//方悦环境面板的按键配置&方悦新风面板的按键配置
			var form = new DevicePanel.PanelSettionWithSourceForm();
			form.AddForm(listNewDevice[0]);
			}
			else
			{
			//方悦新风面板的按键配置
			var form = new DevicePanel.PanelFangyueFreshAirButtonSettionForm();
			var form = new DevicePanel.PanelFangyueButtonSettionForm();
			form.AddForm(listNewDevice[0]);
			}
			};
			@@ -691,8 +807,30 @@
			//只有回路数大于1才能有这个菜单
			if (Common.LocalDevice.Current.GetDevicesCountByMac(listNewDevice[0].DeviceAddr) == 1)
			{
			//新风小模块只有一个回路，但要求新风小模块的新风有功能设置
			if (deviceEnumInfo.ConcreteType != DeviceConcreteType.Relay_FangyueFreshAirModul)
			//空气质量传感器和新风小模块只有一个回路，但要求新风小模块的新风有功能设置
			//晾衣架默认只存储第一回路，其他回路被过滤了
			bool isSpecial = false;
			if (deviceEnumInfo.ConcreteType == DeviceConcreteType.Relay_FangyueFreshAirModul \|\|
			deviceEnumInfo.ConcreteType == DeviceConcreteType.AirQualitySensor)
			{
			isSpecial = true;
			}
			if (deviceEnumInfo.ConcreteType == DeviceConcreteType.Airer)
			{
			isSpecial = true;
			var dev = listNewDevice[0];
			//晾衣架默认只存储第一回路，其他回路在功能界面需要读取时间，所以提前一个界面获取
			//第一版时间功能由于设备不支持，暂时去掉，后期才加上
			//for (int i = 3; i < 6; i++)
			//{
			// //注意，衣架中的状态由不同端点获取
			// //回路3:读取风干开关状态和时间值
			// //回路4:读取烘干开关状态和时间值
			// //回路5:读取消毒开关状态和时间值
			// HdlDeviceAttributeLogic.Current.SendAirerComand(dev, i);
			//}
			}
			if (!isSpecial)
			{
			return;
			}
			@@ -736,7 +874,21 @@
			\|\| deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueEight)
			{
			var form = new DevicePanel.PanelFangyueFunctionSettionForm();
			form.AddForm(listNewDevice[0]);
			form.AddForm(listNewDevice[0], deviceEnumInfo);
			}
			//简约多功能面板的按键配置
			else if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_SimpleMultifunction)
			{
			foreach (var dev in listNewDevice)
			{
			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)
			@@ -845,23 +997,31 @@
			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.IsShowTemplate == true)
			{
			btnSwitch.CanClick = false;
			btnSwitch.IsSelected = TemplateData.TemplateDeviceDataLogic.Current.GetCurtainHandPullControl(deviceCurtain);
			return;
			}
			//如果是虚拟住宅
			if (Common.Config.Instance.Home.IsVirtually == true)
			{
			btnSwitch.IsSelected = TemplateData.TemplateDeviceDataLogic.Current.GetCurtainHandPullControl(deviceCurtain);
			return;
			}

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

			#region ■ 简约多功能面板用___________________
			/// <summary>
			/// 添加【绑定目标】行
			/// </summary>
			private void AddIBindRow(string deviceMac)
			{
			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 dev = Common.LocalDevice.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 = Common.LocalDevice.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 = Common.LocalDevice.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>
			/// 湿度来源行
			/// </summary>
			private void AddHumiditySourceRow(string deviceMac)
			{
			//湿度
			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 dev = Common.LocalDevice.Current.GetDevice(deviceMac, 62);//简约面板随便一个回路来获取设备
			var device = new CommonDevice();
			if (dev != null)
			{
			device.CurrentGateWayId = dev.CurrentGateWayId;
			}
			device.Type = DeviceType.OnOffSwitch;
			device.DeviceAddr = deviceMac;
			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;
			paneTargetsBaseFormp.Show();
			paneTargetsBaseFormp.actionHumidityTarget += (bindName) =>
			{
			HdlThreadLogic.Current.RunMain(() =>
			{
			if (string.IsNullOrEmpty(bindName))
			{
			btnHumidityStatu.Text = Language.StringByID(R.MyInternationalizationString.nothing);
			bindHumidityDev = null;
			}
			else
			{
			btnHumidityStatu.Text = bindName;
			}
			});
			};
			};
			}

			/// <summary>
			/// 温度来源行
			/// </summary>
			private void AddTemperatureSensorRow(string deviceMac)
			{
			//温度来源
			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 dev = Common.LocalDevice.Current.GetDevice(deviceMac, 62);//简约面板随便一个回路来获取设备
			var device = new CommonDevice();
			if (dev != null)
			{
			device.CurrentGateWayId = dev.CurrentGateWayId;
			}
			device.Type = DeviceType.OnOffSwitch;
			device.DeviceAddr = deviceMac;
			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;
			paneTargetsBaseFormp.Show();
			paneTargetsBaseFormp.actionTemperatureTarget += (bindName) =>
			{
			HdlThreadLogic.Current.RunMain(() =>
			{
			if (string.IsNullOrEmpty(bindName))
			{
			btnTemperatureStatu.Text = Language.StringByID(R.MyInternationalizationString.nothing);
			bindTemperatureDev = null;
			}
			else
			{
			btnTemperatureStatu.Text = bindName;
			}
			});
			};
			};
			}

			/// <summary>
			///初始化数据
			/// </summary>
			void InitBindInfo(CommonDevice curControlDev)
			{
			System.Threading.Tasks.Task.Run(async () =>
			{
			try
			{
			Application.RunOnMainThread(() =>
			{
			CommonPage.Loading.Start("");
			});
			//读温湿度数据
			curControlDev.DeviceEpoint = 1;
			var result = await GetBindName(curControlDev);
			if (!result)
			{
			Application.RunOnMainThread(() =>
			{
			new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime) + "(" + "5007_2" + ")", Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);
			});
			return;
			}

			//2、获设备接近感应初始数据
			//接近感应(他们说随便拿一路回路就行了)
			proximitySensorsInfo = await HdlDevicePanelLogic.Current.GetDeviceProximitySensorsSettion(curControlDev);
			if (proximitySensorsInfo == null)
			{
			proximitySensorsInfo = new Panel.PanelProximitySensorInfo();
			//关闭进度条
			this.CloseProgressBar(ShowReLoadMode.YES);
			return ;
			}
			}
			catch (Exception ex)
			{
			var mess = ex.Message;
			}
			finally
			{
			Application.RunOnMainThread(() =>
			{
			//初始化右上角菜单
			this.InitTopRightMenu();
			//初始化中部控件
			this.InitMiddleFrame();
			CommonPage.Loading.Hide();
			});
			}
			});
			}

			/// <summary>
			/// 获取绑定的温湿度目标
			/// </summary>
			/// <param name="curControlDev"></param>
			/// <returns></returns>
			private async System.Threading.Tasks.Task<bool> GetBindName(CommonDevice curControlDev)
			{
			bool result = false;
			var panelBindListRes = HdlDeviceBindLogic.Current.GetDeviceBindAsync(curControlDev);
			if (panelBindListRes != null && panelBindListRes.getAllBindResponseData != null)
			{
			bindList = panelBindListRes.getAllBindResponseData.BindList;
			foreach (var bDev in bindList)
			{
			var device = Common.LocalDevice.Current.GetDevice(bDev.BindMacAddr, bDev.BindEpoint);
			if (device == null)
			{
			continue;
			}
			//获取设备类型的
			var deviceEnumInfo = Common.LocalDevice.Current.GetMyDeviceEnumInfo(new List<CommonDevice>() { device });
			if (device.Type == DeviceType.TemperatureSensor)
			{
			var bD = device as TemperatureSensor;
			if (bD.SensorDiv == 1 && bDev.BindCluster == 1026)
			{
			bindTemperatureName = Common.LocalDevice.Current.GetDeviceEpointName(device);
			bindTemperatureDev = device;
			}
			if (bD.SensorDiv == 2 && bDev.BindCluster == 1029)
			{
			bindHumidityName = Common.LocalDevice.Current.GetDeviceEpointName(device);
			bindHumidityDev = device;
			}

			//空气质量传感器
			if (deviceEnumInfo.ConcreteType == Common.DeviceConcreteType.AirQualitySensor)
			{
			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;
			}
			}
			}
			if (device.Type == DeviceType.FreshAirHumiditySensor)
			{
			bindHumidityName = Common.LocalDevice.Current.GetDeviceEpointName(device);
			bindHumidityDev = 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;
			}
			}
			}
			result = true;
			}
			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 ■ 功能类型(空气开关专用)_____________
			@@ -948,6 +1478,11 @@
			rowFunction.InitControl();
			//底线
			rowFunction.AddBottomLine();
			//查看模板时,不允许编辑
			if (Common.Config.Instance.Home.IsShowTemplate == true)
			{
			rowFunction.CanClick = false;
			}
			}

			#endregion
			@@ -994,7 +1529,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();

			@@ -1034,7 +1573,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) =>
			{
			@@ -1054,7 +1593,8 @@
			};

			//如果当前住宅不是虚拟住宅
			if (Common.Config.Instance.Home.IsVirtually == false)
			if (Config.Instance.Home.IsVirtually == false
			&& Config.Instance.Home.IsShowTemplate == false)
			{
			//设置设备的版本信息
			this.SetDeviceVersionInfo(btnNewVersion, oTADevice);
			@@ -1068,45 +1608,57 @@
			/// <param name="oTADevice">ota设备</param>
			private void SetDeviceVersionInfo(PicViewControl btnNewVersion, OTADevice oTADevice)
			{
			HdlThreadLogic.Current.RunThread(async () =>
			HdlThreadLogic.Current.RunThread(() =>
			{
			bool receiveImageInfo = false;
			//设置设备全部的镜像信息
			HdlDeviceImageInfoLogic.Current.SetAllImageInfoToOtaDevice(oTADevice, (device, reportData) =>
			string checkKey = LocalDevice.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 = LocalDevice.Current.GetDeviceMainKeys(report.DeviceAddr, report.DeviceEpoint);
			if (checkKey == mainKey)
			{
			//已经接收得到
			receiveImageInfo = true;
			}
			}
			});
			//发送命令
			HdlDeviceImageInfoLogic.Current.SetFirmwareVersionComand(oTADevice);

			int count = 5;
			while (receiveImageInfo == false && count > 0)
			{
			//等待设备镜像的反馈
			await Task.Delay(300);
			System.Threading.Thread.Sleep(300);
			count--;
			}
			//移除事件
			HdlDeviceImageInfoLogic.Current.RemoveDeviceFirmwareVersionThread(oTADevice);
			HdlGatewayReceiveLogic.Current.RemoveEvent("SetDeviceVersionInfo");

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

			//获取设备最新版本
			var deviceFirmware = HdlFirmwareUpdateLogic.GetFirmwareMostVersionInfo(FirmwareLevelType.ZigbeeDevice,
			var deviceFirmware = HdlFirmwareUpdateLogic.GetFirmwareMostVersionInfo(FirmwareLevelType.A设备,
			oTADevice.HwVersion.ToString(),
			oTADevice.ImgTypeId.ToString(),
			oTADevice.ImgVersion);

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

			#endregion
			@@ -1117,11 +1669,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;
			@@ -1148,6 +1700,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);
			@@ -1167,7 +1724,17 @@
			//检测此回路是否拥有定位功能(拿端点最小的那个回路去定位)
			bool canTest = Common.LocalDevice.Current.DeviceIsCanFixedPosition(listNewDevice[0]);

			var frame = new TopRightMenuControl(canTest == true ? 2 : 1, 1);
			TopRightMenuControl frame = null;

			if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_SimpleMultifunction)
			{
			frame = new TopRightMenuControl(3, 1);
			}
			else
			{
			frame = new TopRightMenuControl(canTest == true ? 2 : 1, 1);
			}

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

			@@ -1197,6 +1764,23 @@
			this.DoDeleteDevice();
			});
			});

			//同步
			deviceMenu = Language.StringByID(R.MyInternationalizationString.Synchronization);
			if (Common.LocalDevice.Current.DeviceIsCanFixedPosition(listNewDevice[0]))
			{
			frame.AddRowMenu(deviceMenu, "", "Item/SynchronizationSelected.png", () =>
			{
			//如果当前住宅是虚拟住宅,此功能无效
			if (Common.Config.Instance.Home.IsVirtually == true)
			{
			return;
			}

			//同步指定设备
			this.SynchronizationDevice();
			});
			}

			}

			@@ -1225,6 +1809,27 @@
			});
			});
			}

			/// <summary>
			/// 同步指定设备
			/// </summary>
			private void SynchronizationDevice()
			{
			HdlThreadLogic.Current.RunThread(async () =>
			{
			//打开进度条
			this.ShowProgressBar();

			//同步设备
			bool result = await Common.LocalDevice.Current.SynchronizationDevice(listNewDevice);
			//关闭进度条
			this.CloseProgressBar();
			if (result == false)
			{
			return;
			}
			});
			}
			#endregion

			#region ■ 关闭界面___________________________
			@@ -1235,8 +1840,7 @@
			public override void CloseFormBefore()
			{
			HdlGatewayReceiveLogic.Current.RemoveEvent("HandPullControl");
			//移除获取设备硬件信息的监听线程
			HdlDeviceHardInfoLogic.Current.RemoveDeviceHardInfoThread(listNewDevice[0]);
			HdlGatewayReceiveLogic.Current.RemoveEvent("SetDeviceVersionInfo");

			//设备新入网
			if (UserCenterResourse.DicActionForm.ContainsKey("AddDeviceTypeListForm") == true)
			@@ -1256,21 +1860,13 @@
			/// </summary>
			private void RefreshHardFirmwareInfo()
			{
			if (listNewDevice[0].DriveCode > 0)
			if (listNewDevice[0].DriveCode > 0 \|\| Common.Config.Instance.Home.IsShowTemplate == true)
			{
			//虚拟设备没有这种操作
			return;
			}
			//重新获取硬件信息
			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();
			}
			});
			HdlDeviceHardInfoLogic.Current.SetAllHardFirmwareInfoToDevice(listNewDevice[0]);
			}

			#endregion
			@@ -1301,27 +1897,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;
			});
			});
			}