~wxr/HDL_APP_Project.git

			@@ -184,16 +184,22 @@
			/// <summary>
			/// 显示方式切换按钮
			/// </summary>
			//btnSwitchDipaly = new Button()
			//{
			// X = Application.GetRealWidth(335),
			// Y = Application.GetRealHeight(12),
			// Width = Application.GetMinRealAverage(28),
			// Height = Application.GetMinRealAverage(28),
			// UnSelectedImagePath = "Classification/ToggleDisplayThumbnail.png",//缩略图
			// SelectedImagePath = "Classification/ToggleDisplayLarge.png",
			//};
			//roomFloorChangeView.AddChidren(btnSwitchDipaly);
			btnSwitchDipaly = new Button()
			{
			X = Application.GetRealWidth(335),
			Y = Application.GetRealHeight(12),
			Width = Application.GetMinRealAverage(28),
			Height = Application.GetMinRealAverage(28),
			UnSelectedImagePath = "Classification/ToggleDisplayThumbnail.png",//缩略图
			SelectedImagePath = "Classification/ToggleDisplayLarge.png",
			IsSelected = OnAppConfig.Instance.IsShowBigPicture
			};
			roomFloorChangeView.AddChidren(btnSwitchDipaly);
			btnSwitchDipaly.MouseUpEventHandler = (sender, e) => {
			OnAppConfig.Instance.IsShowBigPicture = !OnAppConfig.Instance.IsShowBigPicture;
			btnSwitchDipaly.IsSelected = OnAppConfig.Instance.IsShowBigPicture;
			LoadRoomRows(true);
			};
			#endregion

			/// <summary>
			@@ -216,179 +222,385 @@
			/// <summary>
			/// 加载房间列表区域
			/// </summary>
			void LoadRoomRows()
			/// <param name="animationEffect">动画效果</param>
			void LoadRoomRows(bool animationEffect = false)
			{
			roomListView.RemoveAll();
			foreach (var room in roomsShowed)
			if (animationEffect)
			{
			var roomView = new FrameLayout()
			///移动方向
			var runDirection = OnAppConfig.Instance.IsShowBigPicture ? 1 : -1;
			for (int i = 0; i < roomListView.ChildrenCount; i++)
			{
			Gravity = Gravity.CenterHorizontal,
			Width = Application.GetRealWidth(343),
			Height = Application.GetRealWidth(192),//2020-12-01 房间图片比例改回16:9
			Radius = (uint)Application.GetRealWidth(12),
			Tag = room.roomId,
			};
			roomListView.AddChidren(roomView);
			var childView = roomListView.GetChildren(i);

			var roomViewbg = new ImageView()
			{
			Width = Application.GetRealWidth(343),
			Height = Application.GetRealWidth(192),//2020-12-01 房间图片比例改回16:9
			//ImagePath = room.backgroundImage,
			Radius = (uint)Application.GetRealWidth(12),
			};
			roomView.AddChidren(roomViewbg);

			//2020-12-03 修改图片加载方法
			ImageUtlis.Current.LoadLocalOrNetworkImages(room.backgroundImage, roomViewbg);

			var roomViewbgColor = new Button()
			{
			Radius = (uint)Application.GetRealWidth(12),
			BackgroundColor = 0x19333333,
			};
			roomView.AddChidren(roomViewbgColor);

			var btnFloorAndRoomName = new Button()
			{
			X = Application.GetRealWidth(16),
			Y = Application.GetRealHeight(12 - 2),
			Width = Application.GetRealWidth(266),
			Height = Application.GetRealHeight(22 + 2 + 2),
			Text = room.floorName + room.roomName,
			TextAlignment = TextAlignment.CenterLeft,
			TextColor = CSS_Color.MainBackgroundColor,
			TextSize = CSS_FontSize.SubheadingFontSize,
			};
			roomView.AddChidren(btnFloorAndRoomName);

			#region 环境数据
			//var environmentalView = new FrameLayout()
			//{
			// Y = Application.GetRealHeight(2) + btnFloorAndRoomName.Bottom,
			// Height = Application.GetRealHeight(32),
			// Tag = "EnvironmentalView",
			//};
			//roomView.AddChidren(environmentalView);

			//Button btnTempIcon = new Button()
			//{
			// X = Application.GetRealWidth(12),
			// Gravity = Gravity.CenterVertical,
			// Width = Application.GetMinRealAverage(16),
			// Height = Application.GetMinRealAverage(16),
			// UnSelectedImagePath = "Public/DeviceInfoIcon/TempIcon.png",
			//};
			//environmentalView.AddChidren(btnTempIcon);

			//var btnTempValues = new Button()
			//{
			// X = btnTempIcon.Right + Application.GetRealWidth(4),
			// Width = Application.GetRealWidth(30),
			// Gravity = Gravity.CenterVertical,
			// TextColor = CSS_Color.MainBackgroundColor,
			// TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
			// Text = "--°",
			// TextAlignment = TextAlignment.CenterLeft,
			// Tag = "TempValues"
			//};
			//environmentalView.AddChidren(btnTempValues);

			//Button btnHumidityIcon = new Button()
			//{
			// X = btnTempValues.Right + Application.GetRealWidth(2),
			// Gravity = Gravity.CenterVertical,
			// Width = Application.GetMinRealAverage(16),
			// Height = Application.GetMinRealAverage(16),
			// UnSelectedImagePath = "Public/DeviceInfoIcon/HumidityIcon.png",
			//};
			//environmentalView.AddChidren(btnHumidityIcon);

			//var btnHumidityValues = new Button()
			//{
			// X = btnHumidityIcon.Right + Application.GetRealWidth(4),
			// Width = Application.GetRealWidth(30),
			// Gravity = Gravity.CenterVertical,
			// TextColor = CSS_Color.MainBackgroundColor,
			// TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
			// Text = "--%",
			// TextAlignment = TextAlignment.CenterLeft,
			// Tag = "HumidityValues"
			//};
			//environmentalView.AddChidren(btnHumidityValues);

			//Button btnPm25Icon = new Button()
			//{
			// X = btnHumidityValues.Right + Application.GetRealWidth(2),
			// Gravity = Gravity.CenterVertical,
			// Width = Application.GetMinRealAverage(16),
			// Height = Application.GetMinRealAverage(16),
			// UnSelectedImagePath = "Public/DeviceInfoIcon/Pm25Icon.png",
			//};
			//environmentalView.AddChidren(btnPm25Icon);

			//var btnPm25Values = new Button()
			//{
			// X = btnPm25Icon.Right + Application.GetRealWidth(4),
			// Width = Application.GetRealWidth(30),
			// Gravity = Gravity.CenterVertical,
			// TextColor = CSS_Color.MainBackgroundColor,
			// TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
			// Text = "--",
			// TextAlignment = TextAlignment.CenterLeft,
			// Tag = "Pm25Values"
			//};
			//environmentalView.AddChidren(btnPm25Values);
			//roomView.AddChidren(environmentalView);
			#endregion
			var btnAllClose = new Button()
			{
			X = Application.GetRealWidth(282),
			Y = Application.GetRealWidth(126),
			Width = Application.GetMinRealAverage(58),
			Height = Application.GetMinRealAverage(58),
			UnSelectedImagePath = "Classification/Room/AllCloseIcon.png",
			Tag = "AllClose",
			Visible = false
			};
			roomView.AddChidren(btnAllClose);
			LoadEvent_CloseAllFunction(btnAllClose, room);

			var btn = new Button()
			{
			Height = Application.GetRealWidth(20),
			};
			roomListView.AddChidren(btn);

			roomViewbgColor.MouseUpEventHandler += (sender, e) =>
			{
			Action ReloadRoomName = () =>
			if (childView.GetType() == typeof(FrameLayout))
			{
			btnFloorAndRoomName.Text = room.floorName + room.roomName;
			};
			var roomView = childView as FrameLayout;

			//房间删除事件
			Action deleteAction = () =>
			//大图显示
			if (OnAppConfig.Instance.IsShowBigPicture)
			{
			LoadBigPirtureRoomRow(roomView, roomsShowed[i]);
			}
			else//无图显示
			{
			LoadSmallPirtureRoomRow(roomView, roomsShowed[i]);
			}
			}

			new System.Threading.Thread(() =>
			{
			roomView.RemoveFromParent();
			};
			//需要移动的高度
			var runHeight = Application.GetRealWidth(i * 142);

			//房间背景图修改事件回调
			Action modifyImageAction = () =>
			int runCount = 0;
			//循环次数，动画效果需要在1秒（10次）内完成
			while (runCount < 9)
			{
			Application.RunOnMainThread(() =>
			{
			if (childView.GetType() == typeof(FrameLayout))
			{
			childView.Height += Application.GetRealWidth(14) * runDirection;
			}
			if (i > 0)
			{
			childView.Y += runDirection * Application.GetRealWidth(14 * i);
			}
			});
			runCount++;
			System.Threading.Thread.Sleep(12);
			}
			Application.RunOnMainThread(() =>
			{
			childView.Y += runHeight * runDirection;

			if (childView.GetType() == typeof(FrameLayout))
			{
			if (runDirection == 1)
			{
			childView.Height = Application.GetRealWidth(192+20);
			}
			else
			{
			childView.Height = Application.GetRealWidth(70+20);
			}
			}
			});
			})
			{ IsBackground = true, Priority = System.Threading.ThreadPriority.Highest }.Start();
			}
			}
			else
			{
			roomListView.RemoveAll();
			foreach (var room in roomsShowed)
			{
			//大图显示
			if (OnAppConfig.Instance.IsShowBigPicture)
			{
			//roomViewbg.ImagePath = room.backgroundImage;
			ImageUtlis.Current.LoadLocalOrNetworkImages(room.backgroundImage, roomViewbg);
			};
			roomFloorChangeView.BackgroundColor = roomListView.BackgroundColor = CSS_Color.MainBackgroundColor;
			var roomView = new FrameLayout()
			{
			Gravity = Gravity.CenterHorizontal,
			Width = Application.GetRealWidth(343),
			Height = Application.GetRealWidth(192 + 20),//2020-12-01 房间图片比例改回16:9
			Radius = (uint)Application.GetRealWidth(12),
			Tag = room.roomId,
			BackgroundColor = CSS_Color.MainBackgroundColor,
			};
			roomListView.AddChidren(roomView);

			var view = new RoomPage(room, ReloadRoomName, deleteAction, modifyImageAction);
			MainPage.BasePageView.AddChidren(view);
			view.LoadPage();
			MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
			};
			LoadBigPirtureRoomRow(roomView, room);

			}
			else//无图显示
			{
			roomFloorChangeView.BackgroundColor = roomListView.BackgroundColor = CSS_Color.BackgroundColor;
			var roomView = new FrameLayout()
			{
			Gravity = Gravity.CenterHorizontal,
			Width = Application.GetRealWidth(343),
			Height = Application.GetRealWidth(70 + 20),
			Radius = (uint)Application.GetRealWidth(12),
			Tag = room.roomId,
			BackgroundColor = CSS_Color.MainBackgroundColor,
			};
			roomListView.AddChidren(roomView);
			LoadSmallPirtureRoomRow(roomView, room);
			}
			}
			}
			}

			/// <summary>
			/// 加载大图房间row
			/// </summary>
			/// <param name="roomView"></param>
			/// <param name="room"></param>
			void LoadBigPirtureRoomRow(FrameLayout roomView, Room room)
			{
			roomView.RemoveAll();
			roomFloorChangeView.BackgroundColor = roomListView.BackgroundColor = CSS_Color.MainBackgroundColor;
			roomView.BackgroundColor = CSS_Color.MainBackgroundColor;
			var roomViewbg = new ImageView()
			{
			Width = Application.GetRealWidth(343),
			Height = Application.GetRealWidth(192),//2020-12-01 房间图片比例改回16:9
			Radius = (uint)Application.GetRealWidth(12),
			};
			roomView.AddChidren(roomViewbg);

			//2020-12-03 修改图片加载方法
			ImageUtlis.Current.LoadLocalOrNetworkImages(room.backgroundImage, roomViewbg);

			var btnFloorAndRoomName = new Button()
			{
			X = Application.GetRealWidth(16),
			Y = Application.GetRealHeight(12 - 2),
			Width = Application.GetRealWidth(266),
			Height = Application.GetRealHeight(22 + 2 + 2),
			Text = room.floorName + room.roomName,
			TextAlignment = TextAlignment.CenterLeft,
			TextColor = CSS_Color.MainBackgroundColor,
			TextSize = CSS_FontSize.SubheadingFontSize,
			};
			roomView.AddChidren(btnFloorAndRoomName);

			#region 环境数据
			//var environmentalView = new FrameLayout()
			//{
			// Y = Application.GetRealHeight(2) + btnFloorAndRoomName.Bottom,
			// Height = Application.GetRealHeight(32),
			// Tag = "EnvironmentalView",
			//};
			//roomView.AddChidren(environmentalView);

			//Button btnTempIcon = new Button()
			//{
			// X = Application.GetRealWidth(12),
			// Gravity = Gravity.CenterVertical,
			// Width = Application.GetMinRealAverage(16),
			// Height = Application.GetMinRealAverage(16),
			// UnSelectedImagePath = "Public/DeviceInfoIcon/TempIcon.png",
			//};
			//environmentalView.AddChidren(btnTempIcon);

			//var btnTempValues = new Button()
			//{
			// X = btnTempIcon.Right + Application.GetRealWidth(4),
			// Width = Application.GetRealWidth(30),
			// Gravity = Gravity.CenterVertical,
			// TextColor = CSS_Color.MainBackgroundColor,
			// TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
			// Text = "--°",
			// TextAlignment = TextAlignment.CenterLeft,
			// Tag = "TempValues"
			//};
			//environmentalView.AddChidren(btnTempValues);

			//Button btnHumidityIcon = new Button()
			//{
			// X = btnTempValues.Right + Application.GetRealWidth(2),
			// Gravity = Gravity.CenterVertical,
			// Width = Application.GetMinRealAverage(16),
			// Height = Application.GetMinRealAverage(16),
			// UnSelectedImagePath = "Public/DeviceInfoIcon/HumidityIcon.png",
			//};
			//environmentalView.AddChidren(btnHumidityIcon);

			//var btnHumidityValues = new Button()
			//{
			// X = btnHumidityIcon.Right + Application.GetRealWidth(4),
			// Width = Application.GetRealWidth(30),
			// Gravity = Gravity.CenterVertical,
			// TextColor = CSS_Color.MainBackgroundColor,
			// TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
			// Text = "--%",
			// TextAlignment = TextAlignment.CenterLeft,
			// Tag = "HumidityValues"
			//};
			//environmentalView.AddChidren(btnHumidityValues);

			//Button btnPm25Icon = new Button()
			//{
			// X = btnHumidityValues.Right + Application.GetRealWidth(2),
			// Gravity = Gravity.CenterVertical,
			// Width = Application.GetMinRealAverage(16),
			// Height = Application.GetMinRealAverage(16),
			// UnSelectedImagePath = "Public/DeviceInfoIcon/Pm25Icon.png",
			//};
			//environmentalView.AddChidren(btnPm25Icon);

			//var btnPm25Values = new Button()
			//{
			// X = btnPm25Icon.Right + Application.GetRealWidth(4),
			// Width = Application.GetRealWidth(30),
			// Gravity = Gravity.CenterVertical,
			// TextColor = CSS_Color.MainBackgroundColor,
			// TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
			// Text = "--",
			// TextAlignment = TextAlignment.CenterLeft,
			// Tag = "Pm25Values"
			//};
			//environmentalView.AddChidren(btnPm25Values);
			//roomView.AddChidren(environmentalView);
			#endregion

			var roomViewbgColor = new Button()
			{
			Height = Application.GetRealWidth(192),
			Radius = (uint)Application.GetRealWidth(12),
			BackgroundColor = 0x19333333,
			};
			roomView.AddChidren(roomViewbgColor);

			var btnAllClose = new Button()
			{
			X = Application.GetRealWidth(282),
			Y = Application.GetRealWidth(126),
			Width = Application.GetMinRealAverage(48),
			Height = Application.GetMinRealAverage(48),
			UnSelectedImagePath = "Classification/Room/AllCloseIcon.png",
			Tag = "AllClose",
			Visible = false
			};
			roomView.AddChidren(btnAllClose);
			LoadEvent_CloseAllFunction(btnAllClose, room);

			//var btn = new Button()
			//{
			// Y = Application.GetRealWidth(192),
			// Height = Application.GetRealWidth(20),
			// BackgroundColor = CSS_Color.MainBackgroundColor,
			//};
			//roomView.AddChidren(btn);

			roomViewbgColor.MouseUpEventHandler += (sender, e) =>
			{
			Action ReloadRoomName = () =>
			{
			btnFloorAndRoomName.Text = room.floorName + room.roomName;
			};

			//房间删除事件
			Action deleteAction = () =>
			{
			roomView.RemoveFromParent();
			};

			//房间背景图修改事件回调
			Action modifyImageAction = () =>
			{
			//roomViewbg.ImagePath = room.backgroundImage;
			ImageUtlis.Current.LoadLocalOrNetworkImages(room.backgroundImage, roomViewbg);
			};

			var view = new RoomPage(room, ReloadRoomName, deleteAction, modifyImageAction);
			MainPage.BasePageView.AddChidren(view);
			view.LoadPage();
			MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
			};
			}
			/// <summary>
			/// 记载小图房间row
			/// </summary>
			void LoadSmallPirtureRoomRow(FrameLayout roomView, Room room)
			{
			roomView.RemoveAll();
			roomFloorChangeView.BackgroundColor = roomListView.BackgroundColor = CSS_Color.BackgroundColor;
			roomView.BackgroundColor = CSS_Color.BackgroundColor;
			//roomView.BackgroundColor = CSS_Color.MainBackgroundColor;


			var viewbg = new Button()
			{
			Width = Application.GetRealWidth(343),
			Height = Application.GetRealWidth(70),
			Radius = (uint)Application.GetRealWidth(12),
			BackgroundColor = CSS_Color.MainBackgroundColor,
			};
			roomView.AddChidren(viewbg);

			var btnRoomName = new Button()
			{
			X = Application.GetRealWidth(16),
			//Y = Application.GetRealHeight(12 - 2),
			Width = Application.GetRealWidth(266),
			Height = Application.GetRealHeight(52),
			Text = room.roomName,
			TextAlignment = TextAlignment.CenterLeft,
			TextColor = CSS_Color.FirstLevelTitleColor,
			TextSize = CSS_FontSize.TextFontSize,
			};
			roomView.AddChidren(btnRoomName);

			var btnFloorName = new Button()
			{
			X = Application.GetRealWidth(16),
			Y = Application.GetRealHeight(19),
			Width = Application.GetRealWidth(266),
			Height = Application.GetRealHeight(46),
			Text = room.floorName,
			TextAlignment = TextAlignment.CenterLeft,
			TextColor = CSS_Color.PromptingColor1,
			TextSize = CSS_FontSize.PromptFontSize_SecondaryLevel,
			};
			roomView.AddChidren(btnFloorName);

			var roomViewbg = new ImageView()
			{
			Width = Application.GetRealWidth(343),
			Height = Application.GetRealWidth(70),
			Radius = (uint)Application.GetRealWidth(12),
			};
			roomView.AddChidren(roomViewbg);

			var btnAllClose = new Button()
			{
			X = Application.GetRealWidth(278),
			Y = Application.GetRealWidth(15),
			Width = Application.GetMinRealAverage(50),
			Height = Application.GetMinRealAverage(50),
			UnSelectedImagePath = "Classification/Room/AllCloseIcon2.png",
			Tag = "AllClose",
			Visible = false
			};
			roomView.AddChidren(btnAllClose);
			LoadEvent_CloseAllFunction(btnAllClose, room);

			//var btn = new Button()
			//{
			// Y = Application.GetRealWidth(70),
			// Height = Application.GetRealWidth(20),
			// BackgroundColor = CSS_Color.BackgroundColor,
			//};
			//roomView.AddChidren(btn);

			roomViewbg.MouseUpEventHandler += (sender, e) =>
			{
			Action ReloadRoomName = () =>
			{
			btnFloorName.Text = room.floorName;
			btnRoomName.Text = room.roomName;
			};

			//房间删除事件
			Action deleteAction = () =>
			{
			roomView.RemoveFromParent();
			};
			Action action = () =>
			{
			};

			var view = new RoomPage(room, ReloadRoomName, deleteAction, action);
			MainPage.BasePageView.AddChidren(view);
			view.LoadPage();
			MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
			};
			}


			/// <summary>
			/// 加载功能列表界面
			@@ -475,10 +687,9 @@
			break;
			case ShowFunction.EnergyMonitoring:
			#region 能源
			functionCount = FunctionList.List.GetElectricals().Count;
			functionOnCount = FunctionList.List.GetElectricals().FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
			functionCount = FunctionList.List.GetEnergyList().Count;
			functionOnCount = FunctionList.List.GetEnergyList().FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
			#endregion
			functionCount = 1;
			break;
			case ShowFunction.Environmental:
			#region 环境数据
			@@ -487,20 +698,37 @@
			break;
			case ShowFunction.FreshAir:
			functionCount = FunctionList.List.GetAirFreshList().Count;
			functionOnCount = FunctionList.List.GetAirFreshList().FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
			break;
			case ShowFunction.Music:
			functionCount = Music.A31MusicModel.A31MusicModelList.Count;
			functionOnCount = Music.A31MusicModel.A31MusicModelList.FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
			functionCount = FunctionList.List.GetMusicList().Count;
			#if DEBUG
			functionCount = 1;
			#endif
			break;
			case ShowFunction.Panel:
			break;
			case ShowFunction.SecurityMonitoring:
			//functionCount = 1;
			if (!MainPage.NoLoginMode)
			{
			functionCount = 1;
			}
			break;
			case ShowFunction.Sensor:
			functionCount = FunctionList.List.GetArmSensorList().Count;
			break;
			case ShowFunction.VideoIntercom:
			if (FunctionList.List.videoIntercom != null && FunctionList.List.videoIntercom.Count > 0)
			{
			functionCount = 1;
			}
			break;
			case ShowFunction.SecurityCenter:
			functionCount = FunctionList.List.securities.Count;
			//if (DB_ResidenceData.Instance.GatewayType == 1)
			//{
			// functionCount = 1;
			//}
			break;

			}
			@@ -549,17 +777,18 @@
			{
			X = Application.GetRealWidth(16),
			Y = Application.GetRealHeight(14),
			Width = Application.GetRealWidth(120),
			Width = Application.GetRealWidth(140),
			Height = Application.GetRealHeight(24),
			TextColor = CSS_Color.FirstLevelTitleColor,
			TextSize = CSS_FontSize.TextFontSize,
			TextAlignment = TextAlignment.CenterLeft,
			IsMoreLines = true,
			};
			functionView.AddChidren(btnName);

			if (item != ShowFunction.Environmental && item != ShowFunction.Sensor && item != ShowFunction.VideoIntercom
			&& item != ShowFunction.SecurityMonitoring && item != ShowFunction.FreshAir
			&& item != ShowFunction.EnergyMonitoring
			&& item != ShowFunction.SecurityMonitoring && item != ShowFunction.FreshAir && item != ShowFunction.Music
			&& item != ShowFunction.EnergyMonitoring && item != ShowFunction.SecurityCenter
			&& functionCount != 0)
			{
			Button btnFunctionCount = new Button()
			@@ -623,7 +852,7 @@
			LoadEvent_SwitchFunction(btnLightPower, item, functionView);
			};
			functionPageTitleId = StringId.Lights;


			#endregion
			break;
			case ShowFunction.AC:
			@@ -745,6 +974,7 @@
			btnFunctionViewBg.MouseUpEventHandler = (sender, e) =>
			{
			var skipView = new EnvironmentalPage();// EnvironmentalSciencePage();
			//var skipView = new A_EnvironmentalDataCenter();// EnvironmentalSciencePage();
			MainPage.BasePageView.AddChidren(skipView);
			skipView.LoadPage();
			MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
			@@ -799,14 +1029,29 @@
			btnName.TextID = StringId.Sensor;
			functionPageTitleId = StringId.Sensor;
			break;
			case ShowFunction.VideoIntercom:
			case ShowFunction.VideoIntercom://可视对讲
			btnName.TextID = StringId.VideoIntercom;
			btnFunctionViewBg.MouseUpEventHandler = (sender, e) =>
			{
			var videoMethod = new UI2.FuntionControlView.Video.VideoMethod();
			videoMethod.MianView(this);
			};
			break;
			case ShowFunction.SecurityCenter:
			btnName.TextID = StringId.SecurityCenter;
			btnFunctionViewBg.MouseUpEventHandler = (sender, e) =>
			{
			var page = new ArmCenterPage();
			MainPage.BasePageView.AddChidren(page);
			page.LoadPage();
			MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
			};
			break;

			}
			//界面跳转--音乐跳转自己的界面--环境跳转自己的界面
			if (item != ShowFunction.Music && item != ShowFunction.Environmental && item != ShowFunction.SecurityMonitoring
			&& ShowFunction.EnergyMonitoring!= item)
			&& ShowFunction.EnergyMonitoring!= item && ShowFunction.VideoIntercom != item && ShowFunction.SecurityCenter != item)
			{
			btnFunctionViewBg.MouseUpEventHandler = (sender, e) =>
			{
			@@ -828,7 +1073,7 @@
			#endregion
			}

			#region 切换楼层
			#region 切换楼层
			/// <summary>
			/// 楼层显示切换
			/// </summary>
			@@ -985,6 +1230,6 @@
			{

			}
			#endregion
			#endregion
			}
			}