~wjc/HomeApp.git

			@@ -250,13 +250,10 @@
			}

			//功能和场景bodyView
			this.bodyFrameLayout = new FrameLayout()
			{
			Y = functionSceneView.Bottom,
			Height = Application.GetRealHeight(750),
			Gravity = Gravity.CenterHorizontal,
			BackgroundColor = ZigbeeColor.Current.GXCGrayBackgroundColor
			};
			this.bodyFrameLayout = new FrameLayout();
			bodyFrameLayout.Y = functionSceneView.Bottom;
			bodyFrameLayout.Height = this.listBodyContr.frameTable.Height - functionSceneView.Bottom;
			bodyFrameLayout.BackgroundColor = ZigbeeColor.Current.GXCGrayBackgroundColor;
			this.listBodyContr.frameTable.AddChidren(bodyFrameLayout);

			//选择功能分栏
			@@ -401,6 +398,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++)
			{
			@@ -408,7 +410,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);
			@@ -473,7 +475,7 @@
			btnRoomRightShadow.Visible = true;
			btnRoomBottomShadow.Visible = true;
			//切换当前房间
			HdlRoomLogic.Current.CurrentRoom = listRoom[curIndex];
			HdlRoomLogic.Current.NowMainPageRoom = listRoom[curIndex];
			//刷新设备桌布控件
			this.isRoomChanging = false;
			this.RefreshBodyView();
			@@ -535,7 +537,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);
			//判断该设备能否显示在主页
			@@ -549,7 +551,8 @@
			//当前房间的设备数
			if (listDevice.Count == 0)
			{
			ShowNoFunctionTip();
			//还没有功能哦
			this.ShowNotDataImage(bodyFrameLayout, Language.StringByID(R.MyInternationalizationString.NoFunction_Tip));
			return;
			}
			//设备列表容器控件
			@@ -642,7 +645,7 @@
			cardContr.X = XX;
			cardContr.Y = YY;
			listDeviceBackContr.AddChidren(cardContr);
			cardContr.InitControl(device);
			cardContr.InitControl(device, HdlRoomLogic.Current.NowMainPageRoom);
			//卡片需要被移除的事件
			cardContr.CardNeedRemoveEvent += () =>
			{
			@@ -694,33 +697,6 @@
			System.Threading.Thread.Sleep(50);
			}
			}
			}

			/// <summary>
			/// 显示没有功能
			/// </summary>
			private void ShowNoFunctionTip()
			{
			var noFunction = new Button
			{
			Y = Application.GetRealHeight(69),
			Width = this.GetPictrueRealSize(683),
			Height = this.GetPictrueRealSize(392),
			Gravity = Gravity.CenterHorizontal,
			UnSelectedImagePath = "Item/NoFunction.png"
			};
			bodyFrameLayout.AddChidren(noFunction);

			var noFunctionTip = new Button()
			{
			Y = noFunction.Bottom,
			Height = Application.GetRealHeight(200),
			Text = Language.StringByID(R.MyInternationalizationString.NoFunction_Tip).Replace("{\\r\\n}", "\r\n"),
			TextColor = ZigbeeColor.Current.GXCPlaceHolderTextColor,
			TextAlignment = TextAlignment.Center,
			IsMoreLines = true
			};
			bodyFrameLayout.AddChidren(noFunctionTip);
			}

			#endregion
			@@ -816,7 +792,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)
			@@ -829,8 +805,8 @@

			if (listScene.Count == 0)
			{
			//显示没场景
			this.ShowNoSceneTip();
			//还没有场景哦
			this.ShowNotDataImage(bodyFrameLayout, Language.StringByID(R.MyInternationalizationString.NoScene_Tip));
			return;
			}
			//列表控件
			@@ -912,26 +888,6 @@
			System.Threading.Thread.Sleep(50);
			}
			}
			}

			/// <summary>
			/// 显示没场景
			/// </summary>
			private void ShowNoSceneTip()
			{
			var picNoFunc = new PicViewControl(683, 392);
			picNoFunc.Y = Application.GetRealHeight(69);
			picNoFunc.Gravity = Gravity.CenterHorizontal;
			picNoFunc.UnSelectedImagePath = "Item/NoFunction.png";
			bodyFrameLayout.AddChidren(picNoFunc);

			var btnTip = new NormalViewControl(bodyFrameLayout.Width, Application.GetRealHeight(200), false);
			btnTip.Y = picNoFunc.Bottom;
			btnTip.Text = Language.StringByID(R.MyInternationalizationString.NoScene_Tip).Replace("{\\r\\n}", "\r\n");
			btnTip.TextColor = ZigbeeColor.Current.GXCPlaceHolderTextColor;
			btnTip.TextAlignment = TextAlignment.Center;
			btnTip.IsMoreLines = true;
			bodyFrameLayout.AddChidren(btnTip);
			}

			/// <summary>
			@@ -1103,7 +1059,9 @@

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

			CommonPage.Loading.Hide();
			});
			})
			@@ -1139,16 +1097,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);
			@@ -1166,23 +1117,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);
			@@ -1233,7 +1167,7 @@
			floorFL.FloorAction = (floorId) =>
			{
			btnFloor.Text = Config.Instance.Home.GetFloorNameById(floorId);
			HdlRoomLogic.Current.CurrentRoom = HdlRoomLogic.Current.GetLoveRoom();
			HdlRoomLogic.Current.NowMainPageRoom = HdlRoomLogic.Current.GetLoveRoom();
			this.ShowForm();
			};
			}