~wjc/HomeApp.git

			@@ -20,7 +20,7 @@
			/// <summary>
			/// 列表控件
			/// </summary>
			private VerticalListControl listView = null;
			private VerticalListRefreshControl listView = null;
			/// <summary>
			/// 行控件的信息(Keys：Mac地址)
			/// </summary>
			@@ -43,6 +43,8 @@
			/// </summary>
			public void ShowForm()
			{
			this.ScrollEnabled = false;

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

			@@ -90,8 +92,6 @@
			this.gatewayViewRow = new MyGatewayControl(GatewayResourse.NowSelectGateway);
			bodyFrameLayout.AddChidren(gatewayViewRow);
			gatewayViewRow.InitControl();
			//设置网关接受在线状态推送
			this.AddGatewayOnlinePush();

			//初始化搜索控件
			this.InitSearchControl();
			@@ -128,10 +128,18 @@
			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(() =>
			{
			//下拉刷新
			this.ListViewBeginHeaderRefreshing();
			});
			};
			}

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

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

			//开启设备属性变更监听
			this.AddDeviceAttributePush();
			//开启网关在线监测的线程
			this.StartGatewayOnlieCheckThread();
			//检测设备新版本
			@@ -215,10 +217,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.UnSelectedImagePath = "Item/RightNext.png";
			btnRight.SelectedImagePath = "Item/Down.png";
			rowMenu.frameTable.ChangedChidrenBindMode(btnRight, ChidrenBindMode.NotBind);

			//提示新版本
			var btnNew = new InformationTipView(rowMenu.btnIcon);
			@@ -248,9 +249,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) =>
			@@ -378,8 +391,17 @@
			//pir传感器
			else if (deviceEnumInfo.ConcreteType == DeviceConcreteType.Sensor_Pir)
			{
			var form = new DevicePirSensor.PirSensorBindTargetSettionForm();
			form.AddForm((IASZone)device);
			if (device is IASZone)
			{
			var form = new DevicePirSensor.PirSensorBindTargetSettionForm();
			form.AddForm((IASZone)device);
			}
			else
			{
			//pir传感器,他们又搞了个继电器在里面
			var form = new DeviceFunctionSettionForm();
			form.AddForm(device, true);
			}
			}
			//中央空调
			else if (deviceEnumInfo.ConcreteType == DeviceConcreteType.AirConditioner_ZbGateway)
			@@ -501,6 +523,60 @@

			#endregion

			#region ■ 下拉刷新___________________________

			/// <summary>
			/// 滑动控件下拉刷新
			/// </summary>
			private async void ListViewBeginHeaderRefreshing()
			{
			//如果是在线的
			if (HdlGatewayLogic.Current.CheckGatewayOnlineByFlag(GatewayResourse.NowSelectGateway) == true)
			{
			//检测广播到的这个网关是否拥有住宅ID
			ZbGateway realWay = null;
			if (HdlGatewayLogic.Current.GetRealGateway(ref realWay, GatewayResourse.NowSelectGateway) == true)
			{
			//重新设置住宅ID(这个应该是不经过APP,直接把网关恢复了出厂设置)
			if (HdlGatewayLogic.Current.HomeIdIsEmpty(realWay.getGatewayBaseInfo.HomeId) == true)
			{
			//显示进度条
			ProgressBar.Show();
			int result2 = await HdlGatewayLogic.Current.ReBindNewGateway(realWay);
			//关闭进度条
			ProgressBar.Close();
			if (result2 == -1)
			{
			return;
			}
			}
			}
			}
			if (this.Parent == null)
			{
			return;
			}

			//获取全部设备
			int result = LocalDevice.Current.SetDeviceToMemmoryByGateway(GatewayResourse.NowSelectGateway);
			if (this.Parent == null)
			{
			return;
			}
			HdlThreadLogic.Current.RunMain(() =>
			{
			//隐藏下拉刷新特效
			listView.EndHeaderRefreshing();
			if (result != -1)
			{
			//重新刷新界面
			this.InitMiddleFrame(false);
			}
			});
			}

			#endregion

			#region ■ 网关在线检测_______________________

			/// <summary>
			@@ -559,29 +635,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 +655,6 @@
			this.StartCheckDeviceOnline();
			}

			#endregion

			#region ■ 设备在线___________________________

			/// <summary>
			/// 开启设备在线监测
			/// </summary>
			@@ -615,66 +665,72 @@
			{
			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);
			int statu = 0;
			var list = LocalDevice.Current.GetDeviceListFromGateway(zbway, ref statu, false, ShowErrorMode.NO);
			if (statu != -1)
			{
			for (int i = 0; i < list.Count; i++)
			{
			//设置设备在线状态
			this.ReceiveDeviceStatu(list[i]);
			}
			}
			});
			}

			/// <summary>
			/// 接受设备在线推送
			/// 接受设备状态
			/// </summary>
			/// <param name="device"></param>
			private void ReceiveDeviceStatuPush(CommonDevice device)
			private void ReceiveDeviceStatu(CommonDevice device)
			{
			lock (dicRowInfo)
			DeviceObjRowInfo rowInfo = null;
			if (this.dicRowInfo.ContainsKey(device.DeviceAddr) == true)
			{
			if (this.Parent == null)
			rowInfo = this.dicRowInfo[device.DeviceAddr];
			}
			if (rowInfo == null \|\| rowInfo.MenuRow == null)
			{
			return;
			}
			//刷新设备的在线状态
			string mainkeys = Common.LocalDevice.Current.GetDeviceMainKeys(device);
			var localDevice = Common.LocalDevice.Current.GetDevice(mainkeys);
			if (localDevice != null)
			{
			//在线状态一样的话，不需要刷新
			if (localDevice.IsOnline == device.IsOnline)
			{
			return;
			}
			DeviceObjRowInfo rowInfo = null;
			if (this.dicRowInfo.ContainsKey(device.DeviceAddr) == true)
			{
			rowInfo = this.dicRowInfo[device.DeviceAddr];
			}
			if (rowInfo == null \|\| rowInfo.MenuRow == null)
			{
			return;
			}
			//刷新设备的在线状态
			string mainkeys = Common.LocalDevice.Current.GetDeviceMainKeys(device);
			var localDevice = Common.LocalDevice.Current.GetDevice(mainkeys);
			if (localDevice != null)
			{
			//在线状态一样的话，不需要刷新
			if (localDevice.IsOnline == device.IsOnline)
			{
			return;
			}
			//保存状态
			localDevice.IsOnline = device.IsOnline;
			localDevice.ReSave();
			}
			//保存状态
			localDevice.IsOnline = device.IsOnline;
			localDevice.ReSave();
			}

			HdlThreadLogic.Current.RunMain(() =>
			HdlThreadLogic.Current.RunMain(() =>
			{
			if (rowInfo != null)
			{
			if (rowInfo != null)
			rowInfo.MenuRow.isOnline = device.IsOnline == 1;
			if (rowInfo.dicDetailRow != null)
			{
			rowInfo.MenuRow.isOnline = device.IsOnline == 1;
			if (rowInfo.dicDetailRow != null)
			foreach (var detailRow in rowInfo.dicDetailRow.Values)
			{
			foreach (var detailRow in rowInfo.dicDetailRow.Values)
			{
			detailRow.isOnline = rowInfo.MenuRow.isOnline;
			}
			detailRow.isOnline = rowInfo.MenuRow.isOnline;
			}
			}
			});
			}
			}
			});
			}

			/// <summary>
			@@ -695,6 +751,29 @@
			});
			}
			}
			}

			#endregion

			#region ■ 传感器报警_________________________

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

			#endregion
			@@ -752,32 +831,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 +843,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 +856,6 @@

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

			return;
			}
			}

			@@ -836,23 +892,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 +935,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 +1072,10 @@
			{
			//获取本地网关对象
			ZbGateway zbway = HdlGatewayLogic.Current.GetLocalGateway(zbGatewayId);
			if (zbway == null)
			{
			return;
			}
			btnName.Text = HdlGatewayLogic.Current.GetGatewayName(zbway);
			if (HdlGatewayLogic.Current.CheckGatewayOnlineByFlag(zbway) == false)
			{