~wjc/HomeApp.git

			@@ -72,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;
			@@ -86,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>
			@@ -140,7 +156,7 @@

			//设备备注
			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);
			@@ -149,7 +165,7 @@
			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;
			@@ -168,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);
			@@ -207,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)
			{
			//这里有点特殊,如果回路没有设置有区域的时候,才设置
			@@ -243,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;
			@@ -390,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;
			@@ -475,7 +491,7 @@

			btnswitch.ButtonClickEvent += async (sender, e) =>
			{
			if (UserCenterResourse.UserInfo.AuthorityNo == 1)
			if (HdlUserCenterResourse.ResidenceOption.AuthorityNo == 1)
			{
			if (btnswitch.IsSelected == true)
			{
			@@ -543,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);
			@@ -782,31 +798,10 @@
			private void AddFunctionSettionRow()
			{
			//只有回路数大于1才能有这个菜单
			if (Common.LocalDevice.Current.GetDevicesCountByMac(listNewDevice[0].DeviceAddr) == 1)
			if (HdlDeviceCommonLogic.Current.GetDevicesCountByMac(listNewDevice[0].DeviceAddr) == 1)
			{
			//新风小模块只有一个回路，但要求新风小模块的新风有功能设置
			//晾衣架默认只存储第一回路，其他回路被过滤了
			bool isSpecial = false;
			if (deviceEnumInfo.ConcreteType == DeviceConcreteType.Relay_FangyueFreshAirModul)
			{
			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)
			if (deviceEnumInfo.ConcreteType != DeviceConcreteType.Relay_FangyueFreshAirModul)
			{
			return;
			}
			@@ -989,21 +984,21 @@
			if (Common.Config.Instance.Home.IsShowTemplate == true)
			{
			btnSwitch.CanClick = false;
			btnSwitch.IsSelected = TemplateData.TemplateDeviceDataLogic.Current.GetCurtainHandPullControl(deviceCurtain);
			btnSwitch.IsSelected = HdlTemplateDeviceDataLogic.Current.GetCurtainHandPullControl(deviceCurtain);
			return;
			}
			//如果是虚拟住宅
			if (Common.Config.Instance.Home.IsVirtually == true)
			{
			btnSwitch.IsSelected = TemplateData.TemplateDeviceDataLogic.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;
			@@ -1075,7 +1070,7 @@
			btnBindTargets.AddBottomLine();
			btnBindTargets.ButtonClickEvent += (sender, e) =>
			{
			var dev = Common.LocalDevice.Current.GetDevice(deviceMac, 32);//简约面板随便一个按键来获取设备
			var dev = HdlDeviceCommonLogic.Current.GetDevice(deviceMac, 32);//简约面板随便一个按键来获取设备
			if (dev != null)
			{
			var curControlDev = dev as Panel;
			@@ -1112,7 +1107,7 @@
			proximitySensorsInfo.enable = btnSwitch.IsSelected;

			//简约面板随便一个回路来获取设备信息
			var dev = Common.LocalDevice.Current.GetDevice(deviceMac, 62);
			var dev = HdlDeviceCommonLogic.Current.GetDevice(deviceMac, 62);
			if (dev != null)
			{
			var key = new ZigBee.Device.Panel();
			@@ -1144,7 +1139,7 @@
			rowLight.AddRightArrow();
			rowLight.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)
			{
			@@ -1180,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)
			{
			@@ -1231,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)
			{
			@@ -1329,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;
			@@ -1339,18 +1334,18 @@
			var bD = device as TemperatureSensor;
			if (bD.SensorDiv == 1 && bDev.BindCluster == 1026)
			{
			bindTemperatureName = Common.LocalDevice.Current.GetDeviceEpointName(device);
			bindTemperatureName = HdlDeviceCommonLogic.Current.GetDeviceEpointName(device);
			bindTemperatureDev = device;
			}
			if (bD.SensorDiv == 2 && bDev.BindCluster == 1029)
			{
			bindHumidityName = Common.LocalDevice.Current.GetDeviceEpointName(device);
			bindHumidityName = HdlDeviceCommonLogic.Current.GetDeviceEpointName(device);
			bindHumidityDev = device;
			}
			}
			if (device.Type == DeviceType.FreshAirHumiditySensor)
			{
			bindHumidityName = Common.LocalDevice.Current.GetDeviceEpointName(device);
			bindHumidityName = HdlDeviceCommonLogic.Current.GetDeviceEpointName(device);
			bindHumidityDev = device;
			}
			}
			@@ -1495,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;
			@@ -1556,12 +1551,12 @@
			{
			bool receiveImageInfo = false;
			//设置设备全部的镜像信息
			string checkKey = LocalDevice.Current.GetDeviceMainKeys(oTADevice.DeviceAddr, oTADevice.DeviceEpoint);
			string checkKey = HdlDeviceCommonLogic.Current.GetDeviceMainKeys(oTADevice.DeviceAddr, oTADevice.DeviceEpoint);
			HdlGatewayReceiveLogic.Current.AddAttributeEvent("SetDeviceVersionInfo", ReceiveComandDiv.A设备属性上报, (report) =>
			{
			if (report.DeviceStatusReport.CluterID == (int)Cluster_ID.Ota)
			{
			string mainKey = LocalDevice.Current.GetDeviceMainKeys(report.DeviceAddr, report.DeviceEpoint);
			string mainKey = HdlDeviceCommonLogic.Current.GetDeviceMainKeys(report.DeviceAddr, report.DeviceEpoint);
			if (checkKey == mainKey)
			{
			//已经接收得到
			@@ -1570,7 +1565,7 @@
			}
			});
			//发送命令
			HdlDeviceImageInfoLogic.Current.SetFirmwareVersionComand(oTADevice);
			HdlDeviceAttributeLogic.Current.ReadDeviceFirmwareVersion(oTADevice);

			int count = 5;
			while (receiveImageInfo == false && count > 0)
			@@ -1582,12 +1577,12 @@
			//移除事件
			HdlGatewayReceiveLogic.Current.RemoveEvent("SetDeviceVersionInfo");

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

			//获取设备最新版本
			var deviceFirmware = HdlFirmwareUpdateLogic.GetFirmwareMostVersionInfo(FirmwareLevelType.A设备,
			var deviceFirmware = HdlFirmwareUpdateLogic.Current.GetFirmwareMostVersionInfo(FirmwareLevelType.A设备,
			oTADevice.HwVersion.ToString(),
			oTADevice.ImgTypeId.ToString(),
			oTADevice.ImgVersion);
			@@ -1617,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;
			@@ -1666,7 +1661,7 @@
			private void ShowTopRightMenu()
			{
			//检测此回路是否拥有定位功能(拿端点最小的那个回路去定位)
			bool canTest = Common.LocalDevice.Current.DeviceIsCanFixedPosition(listNewDevice[0]);
			bool canTest = HdlDeviceCommonLogic.Current.DeviceIsCanFixedPosition(listNewDevice[0]);

			TopRightMenuControl frame = null;

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

			@@ -1711,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", () =>
			{
			@@ -1739,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)
			@@ -1765,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)
			@@ -1787,7 +1782,7 @@
			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 });
			}
			@@ -1800,17 +1795,19 @@
			#region ■ 硬件信息___________________________

			/// <summary>
			/// 重新获取硬件信息
			/// 重新获取硬件信息(false:不需要获取,true:需要获取)
			/// </summary>
			private void RefreshHardFirmwareInfo()
			private bool RefreshHardFirmwareInfo()
			{
			if (listNewDevice[0].DriveCode > 0 \|\| Common.Config.Instance.Home.IsShowTemplate == true)
			{
			//虚拟设备没有这种操作
			return;
			return false;
			}
			//重新获取硬件信息
			HdlDeviceHardInfoLogic.Current.SetAllHardFirmwareInfoToDevice(listNewDevice[0]);
			HdlDeviceAttributeLogic.Current.ReadDeviceAllHardFirmwareInfo(listNewDevice[0]);
			//获取设备的固定属性
			return HdlDeviceAttributeLogic.Current.ReadDeviceAllFixedAttribute(listNewDevice[0]);
			}

			#endregion