~wjc/HomeApp.git

			@@ -22,6 +22,10 @@
			/// </summary>
			private VerticalListRefreshControl listView = null;
			/// <summary>
			/// 前一次显示出左滑菜单的RowLayout
			/// </summary>
			private RowLayoutControl oldShowRightMuneRow = null;
			/// <summary>
			/// 行控件的信息(Keys：Mac地址)
			/// </summary>
			private Dictionary<string, DeviceObjRowInfo> dicRowInfo = new Dictionary<string, DeviceObjRowInfo>();
			@@ -55,20 +59,6 @@
			btnAddDeviceIcon.InitControl();
			btnAddDeviceIcon.ButtonClickEvent += (sender, e) =>
			{
			ZbGateway realWay = null;
			if (GatewayResourse.NowSelectGateway == null \|\| HdlGatewayLogic.Current.GetRealGateway(ref realWay, GatewayResourse.NowSelectGateway) == false)
			{
			//网关对象异常,请重新选择网关
			string msg = Language.StringByID(R.MyInternationalizationString.uGatewayIsErrorAndReSelect);
			this.ShowMassage(ShowMsgType.Error, msg, () =>
			{
			var form2 = new GatewayManage.GatewayListForm();
			form2.AddForm();
			});
			return;
			}
			GatewayResourse.NowSelectGateway = realWay;

			var form = new DeviceDirection.AddDeviceTypeListForm();
			form.AddForm();
			};
			@@ -88,8 +78,9 @@
			this.ClearBodyFrame();

			//初始化网关行控件
			GatewayResourse.NowSelectGateway = HdlGatewayLogic.Current.GetLocalGateway(GatewayResourse.AppOldSelectGatewayId);
			this.gatewayViewRow = new MyGatewayControl(GatewayResourse.NowSelectGateway);
			GatewayResourse.NowSelectGatewayId = GatewayResourse.AppOldSelectGatewayId;
			var nowGateway = HdlGatewayLogic.Current.GetLocalGateway(GatewayResourse.AppOldSelectGatewayId);
			this.gatewayViewRow = new MyGatewayControl(nowGateway);
			bodyFrameLayout.AddChidren(gatewayViewRow);
			gatewayViewRow.InitControl();

			@@ -152,9 +143,8 @@
			private void InitDeviceListControl()
			{
			//获取设备列表
			string gwID = HdlGatewayLogic.Current.GetGatewayId(GatewayResourse.NowSelectGateway);
			var listDevice = Common.LocalDevice.Current.GetDeviceByGatewayID(gwID);
			var listSpecialOta = Common.LocalDevice.Current.GetSpecialOtaDevice(gwID);
			var listDevice = Common.LocalDevice.Current.GetDeviceByGatewayID(GatewayResourse.NowSelectGatewayId);
			var listSpecialOta = Common.LocalDevice.Current.GetSpecialOtaDevice(GatewayResourse.NowSelectGatewayId);
			listDevice.AddRange(listSpecialOta);

			this.dicRowInfo.Clear();
			@@ -186,11 +176,14 @@
			//添加设备的菜单行
			this.AddDeviceMenuRow(macAddress);
			}

			//开启网关在线监测的线程
			this.StartGatewayOnlieCheckThread();
			//检测设备新版本
			this.CheckDeviceNewVersion(listOta);
			//如果当前不是虚拟住宅
			if (Common.Config.Instance.Home.IsVirtually == false)
			{
			//开启网关在线监测的线程
			this.StartGatewayOnlieCheckThread();
			//检测设备新版本
			this.CheckDeviceNewVersion(listOta);
			}
			});
			}

			@@ -214,6 +207,7 @@

			//控件
			var rowMenu = new DeviceObjectControl(deviceMac, listView.rowSpace / 2);
			rowMenu.MainKeys = deviceMac;
			frameTable.AddChidren(rowMenu);
			rowMenu.InitControl();
			rowInfo.MenuRow = rowMenu;
			@@ -234,13 +228,8 @@
			if (listdevice.Count > 0 && Common.LocalDevice.Current.DeviceIsCanFixedPosition(listdevice[0]) == true)
			{
			//定位
			var btnPosition = new NormalViewControl(Application.GetRealWidth(184), rowMenu.Height, false);
			var btnPosition = rowMenu.AddEditorControl(false);
			btnPosition.TextID = R.MyInternationalizationString.uFixedPosition;
			btnPosition.TextAlignment = TextAlignment.Center;
			btnPosition.TextSize = 12;
			btnPosition.TextColor = UserCenterColor.Current.White;
			btnPosition.BackgroundColor = 0xff4a4a4a;
			rowMenu.AddRightView(btnPosition);
			btnPosition.ButtonClickEvent += (sender, e) =>
			{
			//定位
			@@ -270,11 +259,30 @@

			rowMenu.frameTable.ButtonClickEvent += (sender, e) =>
			{
			//隐藏菜单
			rowMenu.HideMenu();
			//强制跳转真实设备界面
			if (UserCenterResourse.HideOption.GotoRealDeviceForm == 1)
			{
			var form2 = new DeviceAddSuccessForm();
			form2.AddForm(deviceMac);
			return;
			}
			btnNew.Visible = false;
			var form = new DeviceMacInfoEditorForm();
			form.AddForm(deviceMac);
			//界面跳转,记录当前的正在操作的设备的Mac地址
			this.nowActionDeviceMac = deviceMac;
			};
			//左滑菜单事件
			rowMenu.OpenMenuAction += () =>
			{
			if (this.oldShowRightMuneRow != null && this.oldShowRightMuneRow.MainKeys != rowMenu.MainKeys)
			{
			//左滑菜单只能滑一个
			this.oldShowRightMuneRow.HideMenu();
			}
			this.oldShowRightMuneRow = rowMenu;
			};
			}

			@@ -331,6 +339,7 @@

			//行控件
			var rowDevice = new DeviceRoomControl(device, frame.rowSpace / 2);
			rowDevice.MainKeys = LocalDevice.Current.GetDeviceMainKeys(device);
			frame.AddChidren(rowDevice);
			rowDevice.frameTable.LeftOffset = Application.GetRealWidth(173) - ControlCommonResourse.XXLeft;
			rowDevice.InitControl();
			@@ -349,13 +358,8 @@
			if (Common.LocalDevice.Current.DeviceIsCanFixedPosition(device) == true)
			{
			//定位
			var btnPosition = new NormalViewControl(Application.GetRealWidth(184), rowDevice.Height, false);
			var btnPosition = rowDevice.AddEditorControl(false);
			btnPosition.TextID = R.MyInternationalizationString.uFixedPosition;
			btnPosition.TextAlignment = TextAlignment.Center;
			btnPosition.TextSize = 12;
			btnPosition.TextColor = UserCenterColor.Current.White;
			btnPosition.BackgroundColor = 0xff4a4a4a;
			rowDevice.AddRightView(btnPosition);
			btnPosition.ButtonClickEvent += (sender, e) =>
			{
			//定位
			@@ -365,10 +369,26 @@

			rowDevice.frameTable.ButtonClickEvent += (sender, e) =>
			{
			//隐藏菜单
			rowDevice.HideMenu();
			//界面跳转,记录当前的正在操作的设备的Mac地址
			this.nowActionDeviceMac = device.DeviceAddr;
			//显示设备功能配置界面
			this.ShowDeviceFunctionSettionForm(device, deviceEnumInfo);
			//如果当前住宅不是虚拟住宅
			if (Common.Config.Instance.Home.IsVirtually == false)
			{
			//显示设备功能配置界面
			this.ShowDeviceFunctionSettionForm(device, deviceEnumInfo);
			}
			};
			//左滑菜单事件
			rowDevice.OpenMenuAction += () =>
			{
			if (this.oldShowRightMuneRow != null && this.oldShowRightMuneRow.MainKeys != rowDevice.MainKeys)
			{
			//左滑菜单只能滑一个
			this.oldShowRightMuneRow.HideMenu();
			}
			this.oldShowRightMuneRow = rowDevice;
			};
			}

			@@ -420,8 +440,18 @@
			//新风面板
			else if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueFreshAir)
			{
			var form = new DeviceFunctionSettionForm();
			form.AddForm(device, true);
			//方悦新风面板的按键配置
			//干接点
			if (device.Type == DeviceType.FreshAir)
			{
			var form = new DevicePanel.PanelFangyueFreshAirButtonSettionForm();
			form.AddForm(device);
			}
			else
			{
			var form = new DeviceFunctionSettionForm();
			form.AddForm(device, true);
			}
			}
			//方悦面板
			else if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueTwo
			@@ -563,12 +593,25 @@
			/// </summary>
			private async void ListViewBeginHeaderRefreshing()
			{
			//如果当前住宅是虚拟的
			if (Common.Config.Instance.Home.IsVirtually == true)
			{
			//就显示一个特效而已
			System.Threading.Thread.Sleep(2000);
			HdlThreadLogic.Current.RunMain(() =>
			{
			//隐藏下拉刷新特效
			listView.EndHeaderRefreshing();
			});
			return;
			}
			//如果是在线的
			if (HdlGatewayLogic.Current.CheckGatewayOnlineByFlag(GatewayResourse.NowSelectGateway) == true)
			var nowGateway = HdlGatewayLogic.Current.GetLocalGateway(GatewayResourse.NowSelectGatewayId);
			if (HdlGatewayLogic.Current.CheckGatewayOnlineByFlag(nowGateway) == true)
			{
			//检测广播到的这个网关是否拥有住宅ID
			ZbGateway realWay = null;
			if (HdlGatewayLogic.Current.GetRealGateway(ref realWay, GatewayResourse.NowSelectGateway) == true)
			if (HdlGatewayLogic.Current.GetRealGateway(ref realWay, nowGateway) == true)
			{
			//重新设置住宅ID(这个应该是不经过APP,直接把网关恢复了出厂设置)
			if (HdlGatewayLogic.Current.HomeIdIsEmpty(realWay.getGatewayBaseInfo.HomeId) == true)
			@@ -591,7 +634,7 @@
			}

			//获取全部设备
			int result = LocalDevice.Current.SetDeviceToMemmoryByGateway(GatewayResourse.NowSelectGateway);
			int result = LocalDevice.Current.SetDeviceToMemmoryByGateway(nowGateway);
			if (this.Parent == null)
			{
			return;
			@@ -617,12 +660,7 @@
			/// </summary>
			private void StartGatewayOnlieCheckThread()
			{
			if (GatewayResourse.NowSelectGateway == null)
			{
			return;
			}

			string selectGwId = HdlGatewayLogic.Current.GetGatewayId(GatewayResourse.NowSelectGateway);
			string selectGwId = GatewayResourse.NowSelectGatewayId;
			HdlThreadLogic.Current.RunThread(() =>
			{
			ZbGateway zbGateway = HdlGatewayLogic.Current.GetLocalGateway(selectGwId);
			@@ -694,7 +732,7 @@
			private void StartCheckDeviceOnline()
			{
			//外部调用的话,不再重新获取设备状态
			if (GatewayResourse.NowSelectGateway == null \|\| this.reGetDeviceOnlineStatu == false)
			if (this.reGetDeviceOnlineStatu == false)
			{
			return;
			}
			@@ -702,7 +740,7 @@
			//添加接收设备在线上报的监听
			HdlGatewayReceiveLogic.Current.AddAttributeEvent("DeviceListFormReceivePushOnline", ReceiveComandDiv.A设备在线上报, this.ReceiveDeviceStatu);

			string gwId = HdlGatewayLogic.Current.GetGatewayId(GatewayResourse.NowSelectGateway);
			string gwId = GatewayResourse.NowSelectGatewayId;
			HdlThreadLogic.Current.RunThread(() =>
			{
			//这里主要只是获取在线状态
			@@ -989,8 +1027,6 @@
			HdlGatewayReceiveLogic.Current.RemoveEvent("DeviceListFormSensor");
			HdlGatewayReceiveLogic.Current.RemoveEvent("DeviceListFormReceivePushOnline");

			GatewayResourse.NowSelectGateway = null;

			base.CloseFormBefore();
			}

			@@ -1054,7 +1090,10 @@
			public MyGatewayControl(ZbGateway i_zbGateway)
			{
			this.UseClickStatu = false;
			this.zbGatewayId = HdlGatewayLogic.Current.GetGatewayId(i_zbGateway);
			if (i_zbGateway != null)
			{
			this.zbGatewayId = HdlGatewayLogic.Current.GetGatewayId(i_zbGateway);
			}
			this.BackgroundColor = UserCenterColor.Current.White;
			this.Height = Application.GetRealHeight(173);
			}
			@@ -1068,16 +1107,32 @@
			ZbGateway zbway = HdlGatewayLogic.Current.GetLocalGateway(zbGatewayId);
			//图标
			var btnIcon = this.AddLeftIcon(81);
			HdlGatewayLogic.Current.SetGatewayIcon(btnIcon, zbway);
			if (zbway != null)
			{
			HdlGatewayLogic.Current.SetGatewayIcon(btnIcon, zbway);
			}
			else
			{
			btnIcon.UnSelectedImagePath = "Gateway/GatewayIcon1.png";
			}

			//显示文本
			btnName = this.AddLeftCaption(HdlGatewayLogic.Current.GetGatewayName(zbway), 700);
			btnName = this.AddLeftCaption(string.Empty, 700);
			btnName.Height = Application.GetRealHeight(60);
			btnName.TextSize = 15;
			btnName.Y = Application.GetRealHeight(35);
			if (HdlGatewayLogic.Current.CheckGatewayOnlineByFlag(zbway) == false)
			if (zbway != null)
			{
			btnName.TextColor = UserCenterColor.Current.TextGrayColor1;
			btnName.Text = HdlGatewayLogic.Current.GetGatewayName(zbway);
			if (HdlGatewayLogic.Current.CheckGatewayOnlineByFlag(zbway) == false)
			{
			btnName.TextColor = UserCenterColor.Current.TextGrayColor1;
			}
			}
			else
			{
			//虚拟网关
			btnName.Text = Language.StringByID(R.MyInternationalizationString.uVirtualGateway);
			}

			//当前网关
			@@ -1094,15 +1149,19 @@
			var btnMament = this.AddMostRightView(Language.StringByID(R.MyInternationalizationString.uGatewayManagement), 300);
			btnMament.Name = "btnMament";

			this.ButtonClickEvent += (sernder, e) =>
			//当前不是虚拟住宅的话
			if (Common.Config.Instance.Home.IsVirtually == false)
			{
			if (string.IsNullOrEmpty(((View)sernder).Name) == false)
			this.ButtonClickEvent += (sernder, e) =>
			{
			//打开网关列表界面
			var form = new GatewayManage.GatewayListForm();
			form.AddForm();
			}
			};
			if (string.IsNullOrEmpty(((View)sernder).Name) == false)
			{
			//打开网关列表界面
			var form = new GatewayManage.GatewayListForm();
			form.AddForm();
			}
			};
			}
			}

			/// <summary>