~wjc/HomeApp.git

			@@ -2,6 +2,7 @@
			using System;
			using System.Collections.Generic;
			using System.Text;
			using System.Threading.Tasks;
			using ZigBee.Device;

			namespace Shared.Phone.UserCenter.GatewayManage
			@@ -45,7 +46,7 @@
			btnAdd.InitControl();
			btnAdd.ButtonClickEvent += (sender, e) =>
			{
			var form = new GatewayAdd.NewGateWaySelectForm();
			var form = new GatewayAdd.NewGateWayMenuSelectForm();
			form.AddForm();
			};

			@@ -67,8 +68,11 @@
			listview.BackgroundColor = UserCenterColor.Current.White;
			bodyFrameLayout.AddChidren(listview);

			//设定中部信息
			this.SetMiddleFrameInfo();
			HdlThreadLogic.Current.RunMainInThread(() =>
			{
			//设定中部信息
			this.SetMiddleFrameInfo();
			});
			}

			/// <summary>
			@@ -83,27 +87,20 @@
			List<ZbGateway> listway = HdlGatewayLogic.Current.GetAllLocalGateway();
			if (listway.Count == 0)
			{
			//还没有绑定网关哦
			this.ShowNotDataImage(bodyFrameLayout, Language.StringByID(R.MyInternationalizationString.uHadNotBindGatewayMsg));
			return;
			}

			int count = listway.Count - 1;
			for (int i = 0; i < listway.Count; i++)
			{
			//添加行
			var gwId = HdlGatewayLogic.Current.GetGatewayId(listway[i]);
			this.AddRowLayout(gwId, i != count);
			}
			//调整列表控件的高度
			var realHeight = listview.ChildrenCount * listview.GetChildren(listview.ChildrenCount - 1).Height;
			realHeight += Application.GetRealHeight(23);
			if (realHeight < listview.Height)
			{
			//缩小控件高度
			listview.Height = realHeight;
			this.AddRowLayout(listway[i].GwId, i != listway.Count - 1);
			}

			//设置接受在线状态推送
			this.AddGatewayOnlinePush();
			//调整列表控件的高度
			this.listview.AdjustRealHeight(Application.GetRealHeight(23));

			//开启网关在线监测的线程
			this.StartGatewayOnlieCheckThread(listway);
			}
			@@ -120,100 +117,49 @@
			private void AddRowLayout(string strWayId, bool addLine)
			{
			//网关控件
			var Gateway = HdlGatewayLogic.Current.GetLocalGateway(strWayId);
			var gatewayRow = new GatewayRowControl(Gateway, listview.rowSpace / 2);
			var gateway = HdlGatewayLogic.Current.GetLocalGateway(strWayId);
			var gatewayRow = new GatewayRowControl(gateway, listview.rowSpace / 2);
			listview.AddChidren(gatewayRow);
			gatewayRow.InitControl(81);
			//向右图标
			gatewayRow.frameTable.AddRightArrow();
			//添加在线状态
			gatewayRow.AddOnLineControl();
			if (addLine == true)
			{
			gatewayRow.frameTable.AddBottomLine();
			}

			//提示有新版本
			//提示新版本
			var btnNew = new InformationTipView(gatewayRow.btnIcon);
			btnNew.Visible = false;
			gatewayRow.frameTable.AddChidren(btnNew, ChidrenBindMode.BindEventOnly);
			gatewayRow.frameTable.AddChidren(btnNew, ChidrenBindMode.BindEvent);
			gatewayRow.AddTag("btnNew", btnNew);

			this.dicRowContr[strWayId] = gatewayRow;

			//设置一个选择网关的默认值
			if (string.IsNullOrEmpty(GatewayResourse.AppOldSelectGatewayId) == true && gatewayRow.IsOnline == true)
			{
			this.SaveGatewayIdToLocation(strWayId);
			}

			//编辑按钮
			var btnEditor = new NormalViewControl(Application.GetRealWidth(177), gatewayRow.Height, false);
			btnEditor.BackgroundColor = UserCenterColor.Current.RowEditorButtonColor;
			btnEditor.TextAlignment = TextAlignment.Center;
			btnEditor.TextColor = UserCenterColor.Current.White;
			btnEditor.TextID = R.MyInternationalizationString.uEditor;
			gatewayRow.AddRightView(btnEditor);
			btnEditor.ButtonClickEvent += (sender, e) =>
			{
			//如果点击的是不在线的网关，则当什么事都没有发生
			if (gatewayRow.IsOnline == false)
			{
			//指定的网关不在线
			this.ShowMassage(ShowMsgType.Normal, Language.StringByID(R.MyInternationalizationString.uTheGatewayIsNotOnline));
			return;
			}
			//点击编辑的话，直接隐藏
			btnNew.Visible = false;

			var form = new GatewayInfoEditorForm();
			form.AddForm(Gateway);
			};

			//解除绑定
			var btnUnBind = new NormalViewControl(Application.GetRealWidth(177), gatewayRow.Height, false);
			btnUnBind.BackgroundColor = UserCenterColor.Current.RowDeleteButtonColor;
			btnUnBind.TextAlignment = TextAlignment.Center;
			btnUnBind.TextColor = UserCenterColor.Current.White;
			btnUnBind.TextID = R.MyInternationalizationString.uUnBinded;
			gatewayRow.AddRightView(btnUnBind);
			btnUnBind.ButtonClickEvent += (sender, e) =>
			{
			//如移除网关，该网关绑定的设备列表{0}将清空，确认继续执行该操作？
			string msg = Language.StringByID(R.MyInternationalizationString.uUnBindedMsg);
			if (msg.Contains("{0}") == true)
			{
			msg = string.Format(msg, "\r\n");
			}
			this.ShowMassage(ShowMsgType.Confirm, msg, () =>
			{
			this.DeleteGateway(strWayId, gatewayRow);
			});
			};

			//单击事件
			gatewayRow.frameTable.ButtonClickEvent += (sender, e) =>
			{
			//如果点击的是不在线的网关，则当什么事都没有发生
			if (gatewayRow.IsOnline == false)
			if (UserCenterResourse.HideOption.GotoGatewayProductInfoForm == 1)
			{
			//指定的网关不在线
			this.ShowMassage(ShowMsgType.Normal, Language.StringByID(R.MyInternationalizationString.uTheGatewayIsNotOnline));
			//强制跳转
			var form2 = new GatewayProductInfoForm();
			form2.AddForm(gateway);
			return;
			}
			//如果存在新版本,并且单击他的话
			if (btnNew.Visible == true)
			{
			if (sender is InformationTipView \|\| sender is IconViewControl)
			{
			//打开编辑界面
			btnNew.Visible = false;
			var form = new GatewayInfoEditorForm();
			form.AddForm(Gateway);
			return;
			}
			}
			var form = new GatewayInfoEditorForm();
			form.AddForm(gateway);
			};

			//切换
			var btnSwitch = new NormalViewControl(Application.GetRealWidth(184), gatewayRow.Height, false);
			btnSwitch.BackgroundColor = 0xfffb744a;
			btnSwitch.TextAlignment = TextAlignment.Center;
			btnSwitch.TextColor = UserCenterColor.Current.White;
			btnSwitch.TextSize = 12;
			btnSwitch.TextID = R.MyInternationalizationString.uSwitch1;
			if (strWayId == GatewayResourse.AppOldSelectGatewayId)
			{
			btnSwitch.TextID = R.MyInternationalizationString.uRefresh;
			}
			gatewayRow.AddRightView(btnSwitch);
			btnSwitch.ButtonClickEvent += (sender, e) =>
			{
			//是否切换到{0}网关?
			string msg = string.Format(Language.StringByID(R.MyInternationalizationString.uConfirmWantToSwitchTheGateway), "[" + gatewayRow.btnName.Text + "]");
			if (strWayId == GatewayResourse.AppOldSelectGatewayId)
			@@ -223,10 +169,64 @@
			}
			this.ShowMassage(ShowMsgType.Confirm, msg, () =>
			{
			//执行切换网关操作
			this.DoSwitchGateway(strWayId);
			HdlThreadLogic.Current.RunThread(() =>
			{
			//执行切换网关操作
			this.DoSwitchGateway(strWayId);
			});
			});
			};

			//定位
			var btnPosition = gatewayRow.AddEditorControl(false);
			btnPosition.TextID = R.MyInternationalizationString.uFixedPosition;
			btnPosition.ButtonClickEvent += (sender, e) =>
			{
			//发送定位命令
			HdlGatewayLogic.Current.SetFixedPositionCommand(gateway);
			};

			//删除
			var btnDelete = new NormalViewControl(Application.GetRealWidth(184), gatewayRow.Height, false);
			btnDelete.BackgroundColor = 0xfff75858;
			btnDelete.TextAlignment = TextAlignment.Center;
			btnDelete.TextColor = UserCenterColor.Current.White;
			btnDelete.TextSize = 12;
			btnDelete.TextID = R.MyInternationalizationString.uDelete;
			gatewayRow.AddLeftView(btnDelete);
			btnDelete.ButtonClickEvent += (sender, e) =>
			{
			//如移除网关，该网关绑定的设备列表{0}将清空，确认继续执行该操作？
			string msg = Language.StringByID(R.MyInternationalizationString.uUnBindedMsg);
			if (msg.Contains("{0}") == true)
			{
			msg = string.Format(msg, "\r\n");
			}
			this.ShowMassage(ShowMsgType.Confirm, msg, () =>
			{
			HdlThreadLogic.Current.RunThread(() =>
			{
			this.DeleteGateway(strWayId, gatewayRow);
			});
			});
			};

			this.dicRowContr[strWayId] = gatewayRow;
			//设置一个选择网关的默认值
			if (string.IsNullOrEmpty(GatewayResourse.AppOldSelectGatewayId) == true)
			{
			HdlGatewayLogic.Current.SaveGatewayIdToLocation(strWayId);
			}

			//当前网关的角标
			if (strWayId == GatewayResourse.AppOldSelectGatewayId)
			{
			var btnNow = new IconViewControl(52);
			btnNow.Y = Application.GetMinReal(23) + gatewayRow.frameTable.chidrenYaxis;
			btnNow.UnSelectedImagePath = "Item/NowAcctionTip.png";
			btnNow.X = gatewayRow.btnName.X + gatewayRow.btnName.GetRealWidthByText();
			gatewayRow.frameTable.AddChidren(btnNow, ChidrenBindMode.BindEvent);
			}
			}

			#endregion
			@@ -240,8 +240,12 @@
			/// <param name="row"></param>
			private async void DeleteGateway(string strWayId, GatewayRowControl row)
			{
			//打开进度条
			this.ShowProgressBar();
			//删除云端网关
			bool result = await HdlGatewayLogic.Current.DeleteGateway(strWayId);
			//关闭进度条
			this.CloseProgressBar();
			if (result == false)
			{
			return;
			@@ -251,15 +255,13 @@
			{
			//如果解除绑定的网关是当前所选择的网关的话，则关闭设备管理界面
			this.closeDeviceManagForm = true;
			this.SaveGatewayIdToLocation(string.Empty);
			HdlGatewayLogic.Current.SaveGatewayIdToLocation(string.Empty);
			}

			//移除
			if (this.dicRowContr.ContainsKey(strWayId) == true)
			HdlThreadLogic.Current.RunMain(() =>
			{
			this.dicRowContr.Remove(strWayId);
			}
			row?.RemoveFromParent();
			//初始化中部控件
			this.InitMiddleFrame();
			});
			}

			#endregion
			@@ -270,90 +272,33 @@
			/// 执行切换网关操作
			/// </summary>
			/// <param name="gatewayId"></param>
			/// <param name="online"></param>
			private async void DoSwitchGateway(string gatewayId)
			{
			//显示进度条
			this.ShowProgressBar();
			//获取网关
			var gateway = HdlGatewayLogic.Current.GetLocalGateway(gatewayId);

			//检测广播到的这个网关是否拥有住宅ID
			ZbGateway realWay = null;
			bool getGatewayInfo = true;
			if (HdlGatewayLogic.Current.GetRealGateway(ref realWay, gatewayId) == true)
			{
			//重新设置住宅ID(这个应该是不经过APP,直接把网关恢复了出厂设置)
			if (HdlGatewayLogic.Current.HomeIdIsEmpty(realWay.getGatewayBaseInfo.HomeId) == true)
			{
			int result2 = await HdlGatewayLogic.Current.ReBindNewGateway(realWay);
			if (result2 == 0)
			{
			//出现未知错误,请稍后再试
			this.ShowMassage(ShowMsgType.Tip, Language.StringByID(R.MyInternationalizationString.uUnKnowErrorAndResetAgain));
			//关闭进度条
			this.CloseProgressBar();
			}
			else if (result2 == -1)
			{
			//关闭进度条
			this.CloseProgressBar();
			return;
			}
			//重新绑定网关里面已经重新获取了网关信息
			getGatewayInfo = false;
			}
			}

			if (getGatewayInfo == true)
			{
			//获取网关信息
			var info = await HdlGatewayLogic.Current.GetGatewayNewInfoAsync(gateway);
			if (info == null)
			{
			//关闭进度条
			this.CloseProgressBar();
			return;
			}
			}

			//获取全部设备
			bool result = await Common.LocalDevice.Current.SetDeviceToMemmoryByGateway(gateway);
			//关闭进度条
			this.CloseProgressBar();
			var result = await HdlGatewayLogic.Current.DoSwitchGateway(gatewayId);
			if (result == false)
			{
			return;
			}

			//切换网关,保存缓存
			this.SaveGatewayIdToLocation(gatewayId);
			//如果选择了刷新的网关，则不关闭管理界面
			this.closeDeviceManagForm = false;

			if (UserCenterResourse.DicActionForm.ContainsKey("DeviceListMainForm") == false)
			HdlThreadLogic.Current.RunMain(() =>
			{
			//刷新主画面
			var form = new Device.DeviceListMainForm();
			this.AddFromAndRemoveNowForm(form);
			}
			else
			{
			//关闭界面
			this.CloseForm();
			//刷新主画面(不重新获取设备状态)
			this.LoadFormMethodByName("DeviceListMainForm", "InitMiddleFrame", false);
			}
			}

			/// <summary>
			/// 保存选择的网关ID到本地
			/// </summary>
			/// <param name="gatewayId"></param>
			private void SaveGatewayIdToLocation(string gatewayId)
			{
			GatewayResourse.AppOldSelectGatewayId = gatewayId;
			byte[] data = System.Text.Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(GatewayResourse.AppOldSelectGatewayId));
			Global.WriteFileToDirectoryByBytes(DirNameResourse.LocalMemoryDirectory, DirNameResourse.AppOldSelectGatewayFile, data);
			if (UserCenterResourse.DicActionForm.ContainsKey("DeviceListMainForm") == false)
			{
			//刷新主画面
			var form = new Device.DeviceListMainForm();
			this.AddFromAndRemoveNowForm(form);
			}
			else
			{
			//关闭界面
			this.CloseForm();
			//刷新主画面(不重新获取设备状态)
			this.LoadFormMethodByName("DeviceListMainForm", "InitMiddleFrame");
			}
			});
			}

			#endregion
			@@ -371,11 +316,14 @@
			/// <param name="listway"></param>
			private void StartGatewayOnlieCheckThread(List<ZbGateway> listway)
			{
			var timeValue = (DateTime.Now - oldGetOnlineTime).Milliseconds;
			if (timeValue <= 10000)
			if (oldGetOnlineTime.Year != 1900)
			{
			//最少要间隔十秒,才去重新获取
			return;
			var timeValue = (DateTime.Now - oldGetOnlineTime).TotalSeconds;
			if (timeValue < 10)
			{
			//最少要间隔十秒,才去重新获取
			return;
			}
			}
			oldGetOnlineTime = DateTime.Now;

			@@ -391,7 +339,7 @@
			return;
			}
			bool online = HdlGatewayLogic.Current.CheckGatewayOnlineByFlag(way);
			this.GatewayOnlinePush(way, online);
			this.GatewayOnlinePush(way, online, true);
			}
			//网关新版本检测
			this.CheckGatewayNewVersion(listway);
			@@ -403,7 +351,8 @@
			/// </summary>
			/// <param name="gateWay">网关对象</param>
			/// <param name="online">在线状态变更后的状态</param>
			public override void GatewayOnlinePush(ZbGateway gateWay, bool online)
			/// <param name="hadGwOnline">2020.05.25追加:此住宅是否拥有网关在线</param>
			public override void GatewayOnlinePush(ZbGateway gateWay, bool online, bool hadGwOnline)
			{
			Application.RunOnMainThread(() =>
			{
			@@ -411,10 +360,10 @@
			{
			return;
			}
			string gwid = HdlGatewayLogic.Current.GetGatewayId(gateWay);
			string gwid = gateWay.GwId;
			if (this.dicRowContr.ContainsKey(gwid) == true && this.dicRowContr[gwid] != null)
			{
			this.dicRowContr[gwid].RefreshControl(gateWay);
			this.dicRowContr[gwid].IsOnline = online;
			}
			});
			}
			@@ -449,7 +398,7 @@
			if (result[0] != null \|\| result[1] != null \|\| result[2] != null)
			{
			//有新版本
			string gwid = HdlGatewayLogic.Current.GetGatewayId(way);
			string gwid = way.GwId;
			Application.RunOnMainThread(() =>
			{
			if (this.dicRowContr.ContainsKey(gwid) == true && this.dicRowContr[gwid] != null)
			@@ -472,11 +421,11 @@
			/// <summary>
			/// 画面关闭
			/// </summary>
			public override void CloseForm()
			public override void CloseFormBefore()
			{
			base.CloseForm();
			base.CloseFormBefore();

			if (string.IsNullOrEmpty(GatewayResourse.AppOldSelectGatewayId) == true && this.closeDeviceManagForm == true)
			if (this.closeDeviceManagForm == true)
			{
			//关闭界面
			HdlGatewayLogic.Current.RefreshAppOldSelectGatewayId();
			@@ -493,6 +442,12 @@
			/// </summary>
			public override int FormActionAgainEvent()
			{
			//进到这个界面,理论上前回的网关id是有的,如果为空了,应该是当前的网关被解绑了
			if (GatewayResourse.AppOldSelectGatewayId == string.Empty)
			{
			//关闭设备列表
			this.closeDeviceManagForm = true;
			}
			//初始化中部控件
			this.InitMiddleFrame();
			return 1;