~wjc/HomeApp.git

			@@ -16,6 +16,10 @@
			#region ■ 变量声明___________________________

			/// <summary>
			/// The instance.
			/// </summary>
			public static HomeMainPageForm Instance;
			/// <summary>
			/// 整个界面的上下滑动控件
			/// </summary>
			private VerticalFrameControl listBodyContr = null;
			@@ -49,6 +53,9 @@
			/// </summary>
			public void ShowForm()
			{
			this.FormID = "HomeMainPageForm";
			Instance = this;

			//先初始化左滑房间列表界面(在反射里面初始化)
			if (ListRoomViewFrom.Instance == null) { }

			@@ -75,8 +82,6 @@
			this.AddNormalDeviceReportEvent();
			//添加传感器状态上报事件
			this.AddSensorDeviceReportEvent();
			//将当前的画面保存到内存当中
			UserCenterLogic.AddActionForm(this);
			}

			/// <summary>
			@@ -165,7 +170,7 @@
			selectHouse.Init();
			selectHouse.HouseAction = (houseId) =>
			{
			ChangeResidence(House.GetHouseByHouseId(houseId));
			ChangeResidence(HdlResidenceLogic.Current.GetHouseByHouseId(houseId));
			};
			}
			};
			@@ -398,6 +403,11 @@

			//当前房间
			var listRoom = HdlRoomLogic.Current.GetRoomsByCurrentFloorIdAppendLoveRoom();
			if (HdlRoomLogic.Current.NowMainPageRoom == null)
			{
			//设置第一个为初始房间
			HdlRoomLogic.Current.NowMainPageRoom = listRoom[0];
			}
			var curIndex = 0;
			for (int i = 0; i < listRoom.Count; i++)
			{
			@@ -405,7 +415,7 @@
			roomPageView.AddChidren(roomView);
			roomView.Init(listRoom[i]);

			if (listRoom[i].Id == HdlRoomLogic.Current.CurrentRoom.Id)
			if (listRoom[i].Id == HdlRoomLogic.Current.NowMainPageRoom.Id)
			{
			//当前房间,则显示那些数据出来
			roomView.HideName(false);
			@@ -470,7 +480,7 @@
			btnRoomRightShadow.Visible = true;
			btnRoomBottomShadow.Visible = true;
			//切换当前房间
			HdlRoomLogic.Current.CurrentRoom = listRoom[curIndex];
			HdlRoomLogic.Current.NowMainPageRoom = listRoom[curIndex];
			//刷新设备桌布控件
			this.isRoomChanging = false;
			this.RefreshBodyView();
			@@ -532,7 +542,7 @@
			this.dicDeviceCardControl.Clear();

			var listDevice = new List<CommonDevice>();
			foreach (var mainkeys in HdlRoomLogic.Current.CurrentRoom.ListDevice)
			foreach (var mainkeys in HdlRoomLogic.Current.NowMainPageRoom.ListDevice)
			{
			var device = LocalDevice.Current.GetDevice(mainkeys);
			//判断该设备能否显示在主页
			@@ -630,6 +640,11 @@
			{
			cardContr = new Controls.DeviceDoorLockCardControl();
			}
			//色温灯
			else if (device.Type == DeviceType.ColorTemperatureLight)
			{
			cardContr = new Controls.DeviceColorTemperatureCardControl();
			}
			//无法识别
			else
			{
			@@ -640,7 +655,7 @@
			cardContr.X = XX;
			cardContr.Y = YY;
			listDeviceBackContr.AddChidren(cardContr);
			cardContr.InitControl(device);
			cardContr.InitControl(device, HdlRoomLogic.Current.NowMainPageRoom);
			//卡片需要被移除的事件
			cardContr.CardNeedRemoveEvent += () =>
			{
			@@ -787,7 +802,7 @@
			this.dicDeviceCardControl.Clear();

			var listScene = new List<SceneUI>();
			foreach (int sceneId in HdlRoomLogic.Current.CurrentRoom.ListSceneId)
			foreach (int sceneId in HdlRoomLogic.Current.NowMainPageRoom.ListSceneId)
			{
			var sceneUi = HdlSceneLogic.Current.GetSceneUIBySceneId(sceneId);
			if (sceneUi == null)
			@@ -1046,7 +1061,7 @@
			new System.Threading.Thread(async () =>
			{
			Config.Instance.HomeId = home.Id;
			Config.Instance.Home = House.GetHouseByFilePath(home.FileName);
			Config.Instance.Home = HdlResidenceLogic.Current.GetHouseByHouseId(home.Id);
			Global.CreateHomeDirectory(home.Id);
			Config.Instance.Save();
			//刷新个人中心的内存及线程
			@@ -1054,7 +1069,9 @@

			Application.RunOnMainThread(() =>
			{
			ShowForm();
			//刷新界面
			this.ShowForm();

			CommonPage.Loading.Hide();
			});
			})
			@@ -1090,16 +1107,9 @@
			{
			//刷新卡片信息
			var locadevice = LocalDevice.Current.GetDevice(mainKeys);
			if (report.DeviceStatusReport.CluterID == 513 && report.DeviceStatusReport.AttriBute[0].AttributeId == 28)
			{
			//空调是特殊的,它的开关是属性上报来着.已经接收到网关的反馈
			this.dicDeviceCardControl[mainKeys].SetHadGetResponeResultStatu();
			}
			if (report.DeviceStatusReport.CluterID == 514 && report.DeviceStatusReport.AttriBute[0].AttributeId == 0)
			{
			//新风是特殊的,它的开关是属性上报来着.已经接收到网关的反馈
			this.dicDeviceCardControl[mainKeys].SetHadGetResponeResultStatu();
			}
			//已经接收到网关的反馈 2020.05.09:删除Ack主题
			this.dicDeviceCardControl[mainKeys].SetHadGetResponeResultStatu();
			//刷新控件
			this.dicDeviceCardControl[mainKeys].RefreshControlInfo(locadevice);
			}
			}, ShowErrorMode.NO);
			@@ -1117,23 +1127,6 @@
			bool bolOnline = Common.LocalDevice.Current.CheckDeviceIsOnline(report);
			this.dicDeviceCardControl[mainKeys].SetCardOnlineStatu(bolOnline);
			return;
			}

			}, ShowErrorMode.NO);
			});

			//设备控制反馈上报
			HdlGatewayReceiveLogic.Current.AddAttributeEvent("UserHomeViewDeviceRespone", ReceiveComandDiv.A节点控制反馈, (report) =>
			{
			HdlThreadLogic.Current.RunMain(() =>
			{
			string mainKeys = LocalDevice.Current.GetDeviceMainKeys(report);
			if (this.dicDeviceCardControl.ContainsKey(mainKeys) == true)
			{
			//设备卡片
			var deviceCardContr = this.dicDeviceCardControl[mainKeys];
			//已经接收到网关的反馈
			deviceCardContr.SetHadGetResponeResultStatu();
			}

			}, ShowErrorMode.NO);
			@@ -1183,8 +1176,8 @@
			floorFL.changeFloor = true;
			floorFL.FloorAction = (floorId) =>
			{
			btnFloor.Text = Config.Instance.Home.GetFloorNameById(floorId);
			HdlRoomLogic.Current.CurrentRoom = HdlRoomLogic.Current.GetLoveRoom();
			btnFloor.Text = HdlResidenceLogic.Current.GetFloorNameById(floorId);
			HdlRoomLogic.Current.NowMainPageRoom = HdlRoomLogic.Current.GetLoveRoom();
			this.ShowForm();
			};
			}
			@@ -1198,8 +1191,10 @@
			/// </summary>
			public override void CloseFormBefore()
			{
			//把静态变量的这个东西置空
			Instance = null;

			HdlGatewayReceiveLogic.Current.RemoveEvent("UserHomeViewDeviceOnline");
			HdlGatewayReceiveLogic.Current.RemoveEvent("UserHomeViewDeviceRespone");
			HdlGatewayReceiveLogic.Current.RemoveEvent("UserHomeViewDeviceStatus");
			HdlGatewayReceiveLogic.Current.RemoveEvent("UserHomeViewSensor");