~wjc/HomeApp.git

			@@ -20,7 +20,7 @@
			/// <summary>
			/// 列表控件
			/// </summary>
			private VerticalListControl listView = null;
			private VerticalListRefreshControl listView = null;
			/// <summary>
			/// 行控件的信息(Keys：Mac地址)
			/// </summary>
			@@ -90,8 +90,6 @@
			this.gatewayViewRow = new MyGatewayControl(GatewayResourse.NowSelectGateway);
			bodyFrameLayout.AddChidren(gatewayViewRow);
			gatewayViewRow.InitControl();
			//设置网关接受在线状态推送
			this.AddGatewayOnlinePush();

			//初始化搜索控件
			this.InitSearchControl();
			@@ -128,10 +126,29 @@
			txtSearchControl.BindEvent(this.SetRowDataBySearchKeys);

			//列表控件
			listView = new VerticalListControl(29);
			listView = new VerticalListRefreshControl(29);
			listView.Y = txtSearchControl.Bottom + Application.GetRealHeight(29);
			listView.Height = frame.Height - txtSearchControl.Bottom - Application.GetRealHeight(29);
			frame.AddChidren(listView);
			listView.BeginHeaderRefreshingAction += () =>
			{
			//下拉刷新
			HdlThreadLogic.Current.RunThread(() =>
			{
			//获取全部设备
			bool result = LocalDevice.Current.SetDeviceToMemmoryByGateway(GatewayResourse.NowSelectGateway);
			HdlThreadLogic.Current.RunMain(() =>
			{
			//隐藏下拉刷新特效
			listView.EndHeaderRefreshing();
			if (result == true)
			{
			//重新刷新界面
			this.InitMiddleFrame(false);
			}
			});
			});
			};
			}

			#endregion
			@@ -158,12 +175,8 @@
			//根据MAC合并设备列表
			this.MargeAllDeviceByMac(listDevice);

			Application.RunOnMainThread(() =>
			HdlThreadLogic.Current.RunMain(() =>
			{
			if (this.Parent == null)
			{
			return;
			}
			var listOta = new List<OTADevice>();
			foreach (var macAddress in this.dicRowInfo.Keys)
			{
			@@ -176,13 +189,7 @@
			//添加设备的菜单行
			this.AddDeviceMenuRow(macAddress);
			}
			//添加底部间隙
			var frameTemp = new FrameLayout();
			frameTemp.Height = Application.GetRealHeight(23);
			listView.AddChidren(frameTemp);

			//开启设备属性变更监听
			this.AddDeviceAttributePush();
			//开启网关在线监测的线程
			this.StartGatewayOnlieCheckThread();
			//检测设备新版本
			@@ -215,10 +222,9 @@
			rowInfo.MenuRow = rowMenu;
			//向右图标
			var btnRight = rowMenu.frameTable.AddMostRightEmptyIcon(58, 58);
			rowMenu.frameTable.ChangedChidrenBindMode(btnRight, ChidrenBindMode.NotBind);
			btnRight.UseClickStatu = false;
			btnRight.UnSelectedImagePath = "Item/Next.png";
			btnRight.SelectedImagePath = "Item/Down.png";
			rowMenu.frameTable.ChangedChidrenBindMode(btnRight, ChidrenBindMode.NotBind);

			//提示新版本
			var btnNew = new InformationTipView(rowMenu.btnIcon);
			@@ -248,9 +254,21 @@
			//展开,折叠
			btnRight.ButtonClickEvent += (sender, e) =>
			{
			btnRight.IsSelected = !btnRight.IsSelected;
			//展开或者折叠明细列表
			this.ShowDetailList(deviceMac, btnRight.IsSelected);
			//回路数大于1才展开
			if (Common.LocalDevice.Current.GetDevicesCountByMac(deviceMac) > 1)
			{
			btnRight.IsSelected = !btnRight.IsSelected;
			//展开或者折叠明细列表
			this.ShowDetailList(deviceMac, btnRight.IsSelected);
			}
			else
			{
			btnNew.Visible = false;
			var form = new DeviceMacInfoEditorForm();
			form.AddForm(deviceMac);
			//界面跳转,记录当前的正在操作的设备的Mac地址
			this.nowActionDeviceMac = deviceMac;
			}
			};

			rowMenu.frameTable.ButtonClickEvent += (sender, e) =>
			@@ -559,29 +577,7 @@

			#endregion

			#region ■ 设备属性变更推送___________________

			/// <summary>
			/// 设备属性变更推送
			/// </summary>
			/// <param name="device"></param>
			public override void DeviceAttributePush(CommonDevice device)
			{
			if (dicRowInfo.ContainsKey(device.DeviceAddr) == false)
			{
			return;
			}
			var rowInfo = dicRowInfo[device.DeviceAddr];
			Application.RunOnMainThread(() =>
			{
			//刷新菜单
			rowInfo.MenuRow?.RefreshControlInfo(false);
			});
			}

			#endregion

			#region ■ 开启设备在线线程___________________
			#region ■ 设备在线检测_______________________

			/// <summary>
			/// 开启设备在线线程
			@@ -601,10 +597,6 @@
			this.StartCheckDeviceOnline();
			}

			#endregion

			#region ■ 设备在线___________________________

			/// <summary>
			/// 开启设备在线监测
			/// </summary>
			@@ -615,20 +607,24 @@
			{
			return;
			}

			//添加接收设备在线上报的监听
			HdlGatewayReceiveLogic.Current.AddAttributeEvent("DeviceListFormReceivePushOnline", ReceiveComandDiv.A设备在线上报, this.ReceiveDeviceStatu);

			string gwId = HdlGatewayLogic.Current.GetGatewayId(GatewayResourse.NowSelectGateway);
			HdlThreadLogic.Current.RunThread(() =>
			{
			//这里主要只是获取在线状态
			var zbway = HdlGatewayLogic.Current.GetLocalGateway(gwId);
			var result = Common.LocalDevice.Current.GetDeviceListFromGateway(zbway, false, this.ReceiveDeviceStatuPush, ShowErrorMode.NO);
			var result = Common.LocalDevice.Current.GetDeviceListFromGateway(zbway, false, this.ReceiveDeviceStatu, ShowErrorMode.NO);
			});
			}

			/// <summary>
			/// 接受设备在线推送
			/// 接受设备状态
			/// </summary>
			/// <param name="device"></param>
			private void ReceiveDeviceStatuPush(CommonDevice device)
			private void ReceiveDeviceStatu(CommonDevice device)
			{
			lock (dicRowInfo)
			{
			@@ -699,6 +695,29 @@

			#endregion

			#region ■ 传感器报警_________________________

			/// <summary>
			/// 开启传感器报警监视
			/// </summary>
			private void StartCheckDeviceAlarm()
			{
			HdlGatewayReceiveLogic.Current.AddAttributeEvent("DeviceListFormSensor", ReceiveComandDiv.A传感器上报, (device) =>
			{
			Application.RunOnMainThread(() =>
			{
			if (this.dicRowInfo.ContainsKey(device.DeviceAddr) == false)
			{
			return;
			}
			//显示传感器上报的特效
			this.dicRowInfo[device.DeviceAddr].MenuRow?.StartSensorPushAppeal();
			});
			});
			}

			#endregion

			#region ■ 设备新版本_________________________

			/// <summary>
			@@ -752,32 +771,6 @@

			#endregion

			#region ■ 传感器报警_________________________

			/// <summary>
			/// 开启传感器报警监视
			/// </summary>
			private void StartCheckDeviceAlarm()
			{
			HdlDeviceAttributeLogic.Current.AddAttributeEvent("DeviceListFormSensor", "IASInfoReport", (device) =>
			{
			Application.RunOnMainThread(() =>
			{
			if (this.dicRowInfo.ContainsKey(device.DeviceAddr) == false)
			{
			return;
			}
			var row = this.dicRowInfo[device.DeviceAddr].MenuRow;
			if (row != null)
			{
			row.frameTable.StartSelectStatuAppeal(3000);
			}
			});
			});
			}

			#endregion

			#region ■ 实现外部调用_______________________

			/// <summary>
			@@ -790,6 +783,11 @@
			if (this.dicRowInfo.ContainsKey(deviceAddr) == false)
			{
			var localDevice = Common.LocalDevice.Current.GetDevicesByMac(deviceAddr);
			if (localDevice.Count == 0)
			{
			//入网之后，又把它删了
			return;
			}
			var rowNewInfo = new DeviceObjRowInfo();
			rowNewInfo.DeviceMac = deviceAddr;
			rowNewInfo.MacName = Common.LocalDevice.Current.GetDeviceMacName(localDevice[0]);
			@@ -798,8 +796,6 @@

			//创建新的行
			this.AddDeviceMenuRow(deviceAddr);

			return;
			}
			}

			@@ -836,23 +832,6 @@
			info.DeviveTypeName = Common.LocalDevice.Current.GetDeviceObjectText(dic[mac]);
			this.dicRowInfo[mac] = info;
			}
			}

			#endregion

			#region ■ 关闭界面___________________________

			/// <summary>
			/// 画面关闭
			/// </summary>
			public override void CloseForm()
			{
			HdlDeviceAttributeLogic.Current.RemoveEvent("DeviceListFormSensor");
			HdlDeviceAttributeLogic.Current.RemoveEvent("DeviceListFormReceivePushOnline");

			GatewayResourse.NowSelectGateway = null;

			base.CloseForm();
			}

			#endregion
			@@ -896,6 +875,23 @@
			this.gatewayViewRow.RefreshControl();

			return 1;
			}

			#endregion

			#region ■ 关闭界面___________________________

			/// <summary>
			/// 画面关闭
			/// </summary>
			public override void CloseFormBefore()
			{
			HdlGatewayReceiveLogic.Current.RemoveEvent("DeviceListFormSensor");
			HdlGatewayReceiveLogic.Current.RemoveEvent("DeviceListFormReceivePushOnline");

			GatewayResourse.NowSelectGateway = null;

			base.CloseFormBefore();
			}

			#endregion
			@@ -1016,6 +1012,10 @@
			{
			//获取本地网关对象
			ZbGateway zbway = HdlGatewayLogic.Current.GetLocalGateway(zbGatewayId);
			if (zbway == null)
			{
			return;
			}
			btnName.Text = HdlGatewayLogic.Current.GetGatewayName(zbway);
			if (HdlGatewayLogic.Current.CheckGatewayOnlineByFlag(zbway) == false)
			{