~wxr/HDL_APP_Project.git

			@@ -177,7 +177,7 @@
			TextColor = CSS_Color.FirstLevelTitleColor,
			TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
			TextAlignment = TextAlignment.CenterLeft,
			Text = DB_ResidenceData.residenceData.CurFoor,
			Text = DB_ResidenceData.Instance.CurFloor.roomName,
			};
			roomFloorChangeView.AddChidren(btnFloor);
			/// <summary>
			@@ -373,7 +373,14 @@
			roomView.RemoveFromParent();
			};

			var view = new RoomPage(room, ReloadRoomName, deleteAction);
			//房间背景图修改事件回调
			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;
			@@ -423,10 +430,11 @@

			var lastY1 = Application.GetRealWidth(16);
			var lastY2 = Application.GetRealWidth(16);
			var functionContentViewHeight = Application.GetRealWidth(16);

			var functionCategoryCount = 0;

			foreach (var item in DB_ResidenceData.residenceData.functionTypeList)
			foreach (var item in DB_ResidenceData.Instance.functionTypeList)
			{
			int functionCount = 0;
			int functionOnCount = 0;
			@@ -434,41 +442,41 @@
			{
			case ShowFunction.Light:
			#region Light
			functionCount = DB_ResidenceData.functionList.lights.Count;
			functionOnCount = DB_ResidenceData.functionList.lights.FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
			functionCount = FunctionList.List.lights.Count;
			functionOnCount = FunctionList.List.lights.FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
			#endregion
			break;
			case ShowFunction.AC:
			#region AC
			functionCount = DB_ResidenceData.functionList.aCs.Count;
			functionOnCount = DB_ResidenceData.functionList.aCs.FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
			functionCount = FunctionList.List.aCs.Count;
			functionOnCount = FunctionList.List.aCs.FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
			#endregion
			break;
			case ShowFunction.Curtain:
			#region Curtain
			functionCount = DB_ResidenceData.functionList.curtains.Count;
			functionOnCount = DB_ResidenceData.functionList.curtains.FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
			functionCount = FunctionList.List.curtains.Count;
			functionOnCount = FunctionList.List.curtains.FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
			#endregion
			break;
			case ShowFunction.FloorHeating:
			#region 地热
			functionCount = DB_ResidenceData.functionList.floorHeatings.Count;
			functionOnCount = DB_ResidenceData.functionList.floorHeatings.FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
			functionCount = FunctionList.List.floorHeatings.Count;
			functionOnCount = FunctionList.List.floorHeatings.FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
			#endregion
			break;
			case ShowFunction.DoorLock:
			break;
			case ShowFunction.Electric:
			#region 电器
			functionCount = DB_ResidenceData.functionList.electricals.Count;
			functionOnCount = DB_ResidenceData.functionList.electricals.FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
			functionCount = FunctionList.List.electricals.Count;
			functionOnCount = FunctionList.List.electricals.FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
			#endregion
			break;
			case ShowFunction.EnergyMonitoring:
			break;
			case ShowFunction.Environmental:
			#region 环境数据
			functionCount = DB_ResidenceData.functionList.sensorsEnvironmentalScience.Count;
			functionCount = FunctionList.List.sensorsEnvironmentalScience.Count;
			#endregion
			break;
			case ShowFunction.FreshAir:
			@@ -482,16 +490,20 @@
			case ShowFunction.SecurityMonitoring:
			break;
			case ShowFunction.Sensor:
			functionCount = FunctionList.List.sensorsArm.Count;
			//functionOnCount = FunctionList.List.aCs.FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
			break;
			case ShowFunction.VideoIntercom:
			functionCount = 1;
			break;

			}

			if (functionCount == 0 && item != ShowFunction.Music)
			if(functionCount == 0)
			{
			//continue;
			continue;
			}

			functionCategoryCount++;

			FrameLayout functionView = new FrameLayout()
			@@ -524,6 +536,7 @@
			{
			s2View.AddChidren(functionView);
			}
			functionContentViewHeight = functionView.Bottom;


			Button btnName = new Button()
			@@ -537,6 +550,37 @@
			TextAlignment = TextAlignment.CenterLeft,
			};
			functionView.AddChidren(btnName);

			if (item != ShowFunction.Environmental && item != ShowFunction.Sensor && item != ShowFunction.VideoIntercom
			&& functionCount != 0)
			{
			Button btnFunctionCount = new Button()
			{
			X = Application.GetRealWidth(17) + Application.GetRealWidth(7 * functionCount.ToString().Length),
			Y = btnName.Bottom,
			Width = Application.GetRealWidth(120),
			Height = Application.GetRealHeight(24),
			TextColor = CSS_Color.PromptingColor1,
			TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
			TextAlignment = TextAlignment.CenterLeft,
			Text = "/" + functionCount,
			};
			functionView.AddChidren(btnFunctionCount);
			Button btnOpenCount = new Button()
			{
			X = Application.GetRealWidth(16),
			Y = btnName.Bottom,
			Width = Application.GetRealWidth(14 * functionCount.ToString().Length),
			Height = Application.GetRealHeight(24),
			TextColor = CSS_Color.MainColor,
			TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
			TextAlignment = TextAlignment.CenterLeft,
			Text = functionOnCount.ToString(),
			Tag = item + "_onCount",
			BorderWidth = 0,
			};
			functionView.AddChidren(btnOpenCount);
			}


			Button btnFunctionViewBg;
			@@ -553,8 +597,8 @@
			case ShowFunction.Light:
			#region Light
			btnName.TextID = StringId.Lights;
			functionCount = DB_ResidenceData.functionList.lights.Count;
			functionOnCount = DB_ResidenceData.functionList.lights.FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
			functionCount = FunctionList.List.lights.Count;
			functionOnCount = FunctionList.List.lights.FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
			Button btnLightPower = new Button()
			{
			X = Application.GetRealWidth(120),
			@@ -570,7 +614,7 @@

			btnLightPower.MouseUpEventHandler = (sender, e) =>
			{
			LoadEvent_SwitchFunction(btnLightPower, item);
			LoadEvent_SwitchFunction(btnLightPower, item, functionView);
			};
			functionPageTitleId = StringId.Lights;

			@@ -579,8 +623,8 @@
			case ShowFunction.AC:
			#region AC
			btnName.TextID = StringId.AC;
			functionCount = DB_ResidenceData.functionList.aCs.Count;
			functionOnCount = DB_ResidenceData.functionList.aCs.FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
			functionCount = FunctionList.List.aCs.Count;
			functionOnCount = FunctionList.List.aCs.FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
			Button btnAcPower = new Button()
			{
			X = Application.GetRealWidth(120),
			@@ -595,7 +639,7 @@
			functionView.AddChidren(btnAcPower);
			btnAcPower.MouseUpEventHandler = (sender, e) =>
			{
			LoadEvent_SwitchFunction(btnAcPower, item);
			LoadEvent_SwitchFunction(btnAcPower, item, functionView);
			};
			functionPageTitleId = StringId.AC;
			#endregion
			@@ -603,8 +647,8 @@
			case ShowFunction.Curtain:
			#region Curtain
			btnName.TextID = StringId.Curtain;
			functionCount = DB_ResidenceData.functionList.curtains.Count;
			functionOnCount = DB_ResidenceData.functionList.curtains.FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
			functionCount = FunctionList.List.curtains.Count;
			functionOnCount = FunctionList.List.curtains.FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
			Button btnClose;
			btnClose = new Button()
			{
			@@ -614,8 +658,7 @@
			Height = Application.GetRealWidth(32),
			UnSelectedImagePath = "FunctionIcon/Curtain/CurtainCloseIcon.png",
			SelectedImagePath = "FunctionIcon/Curtain/CurtainCloseOnIcon.png",
			//Tag = item + "_AllControl",
			IsSelected = false
			IsSelected = !DB_ResidenceData.Instance.GlobalCurtainStatus,
			};
			functionView.AddChidren(btnClose);

			@@ -628,10 +671,10 @@
			Height = Application.GetRealWidth(32),
			UnSelectedImagePath = "FunctionIcon/Curtain/CurtainOpenIcon.png",
			SelectedImagePath = "FunctionIcon/Curtain/CurtainOpenOnIcon.png",
			IsSelected = true,
			IsSelected = DB_ResidenceData.Instance.GlobalCurtainStatus,
			};
			functionView.AddChidren(btnOpen);
			LoadEvent_CurtainSwitch(btnClose, btnOpen);
			LoadEvent_CurtainSwitch(btnClose, btnOpen, functionView);

			functionPageTitleId = StringId.Curtain;
			#endregion
			@@ -639,8 +682,8 @@
			case ShowFunction.FloorHeating:
			#region 地热
			btnName.TextID = StringId.FloorHeating;
			functionCount = DB_ResidenceData.functionList.floorHeatings.Count;
			functionOnCount = DB_ResidenceData.functionList.floorHeatings.FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
			functionCount = FunctionList.List.floorHeatings.Count;
			functionOnCount = FunctionList.List.floorHeatings.FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
			Button btnFhPower = new Button()
			{
			X = Application.GetRealWidth(120),
			@@ -655,7 +698,7 @@
			functionView.AddChidren(btnFhPower);
			btnFhPower.MouseUpEventHandler = (sender, e) =>
			{
			LoadEvent_SwitchFunction(btnFhPower, item);
			LoadEvent_SwitchFunction(btnFhPower, item, functionView);
			};
			functionPageTitleId = StringId.FloorHeating;
			#endregion
			@@ -666,8 +709,8 @@
			case ShowFunction.Electric:
			#region 电器
			btnName.TextID = StringId.Electric;
			functionCount = DB_ResidenceData.functionList.electricals.Count;
			functionOnCount = DB_ResidenceData.functionList.electricals.FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
			functionCount = FunctionList.List.electricals.Count;
			functionOnCount = FunctionList.List.electricals.FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
			Button btnElectricPower = new Button()
			{
			X = Application.GetRealWidth(120),
			@@ -682,7 +725,7 @@
			functionView.AddChidren(btnElectricPower);
			btnElectricPower.MouseUpEventHandler = (sender, e) =>
			{
			LoadEvent_SwitchFunction(btnElectricPower, item);
			LoadEvent_SwitchFunction(btnElectricPower, item, functionView);
			};
			functionPageTitleId = StringId.Electric;
			#endregion
			@@ -725,15 +768,23 @@
			break;
			case ShowFunction.Sensor:
			btnName.TextID = StringId.Sensor;

			functionPageTitleId = StringId.Sensor;
			break;
			case ShowFunction.VideoIntercom:
			btnName.TextID = StringId.VideoIntercom;
			btnFunctionViewBg.MouseUpEventHandler = (sender, e) =>
			{
			#if __IOS__
			EZSDK.IOS.EZSDK.Go2EZvizMonitor();
			#else //安卓摄像头

			#endif
			};
			break;

			}
			//界面跳转--音乐跳转自己的界面--环境跳转自己的界面
			if (item != ShowFunction.Music && item != ShowFunction.Environmental)
			if (item != ShowFunction.Music && item != ShowFunction.Environmental && item != ShowFunction.VideoIntercom)
			{
			btnFunctionViewBg.MouseUpEventHandler = (sender, e) =>
			{
			@@ -743,48 +794,19 @@
			MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
			};
			}
			if (item != ShowFunction.Environmental && functionCount != 0)
			{
			Button btnFunctionCount = new Button()
			{
			X = Application.GetRealWidth(16) + Application.GetRealWidth(7 * functionCount.ToString().Length),
			Y = btnName.Bottom,
			Width = Application.GetRealWidth(120),
			Height = Application.GetRealHeight(24),
			TextColor = CSS_Color.PromptingColor1,
			TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
			TextAlignment = TextAlignment.CenterLeft,
			Text = "/" + functionCount,
			};
			functionView.AddChidren(btnFunctionCount);
			Button btnOpenCount = new Button()
			{
			X = Application.GetRealWidth(16),
			Y = btnName.Bottom,
			Width = Application.GetRealWidth(12 * functionCount.ToString().Length),
			Height = Application.GetRealHeight(24),
			TextColor = CSS_Color.MainColor,
			TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
			TextAlignment = TextAlignment.CenterLeft,
			Text = functionOnCount.ToString(),
			Tag = item + "_onCount",
			BorderWidth = 0,
			};
			functionView.AddChidren(btnOpenCount);
			}
			index++;
			}

			if (functionCategoryCount > 4)
			//if (functionCategoryCount > 4)
			{
			functionContentView.Height = Application.GetRealHeight((220 * functionCategoryCount / 2) + 20);
			s1View.Height = s2View.Height = functionContentView.Height;
			//functionContentView.Height = functionContentViewHeight;// Application.GetRealWidth((240 * (functionCategoryCount / 2)));
			s1View.Height = s2View.Height = functionContentView.Height = functionContentViewHeight+ Application.GetRealWidth(40);
			}

			#endregion
			#endregion
			}

			#region 切换楼层
			#region 切换楼层
			/// <summary>
			/// 楼层显示切换
			/// </summary>
			@@ -871,17 +893,18 @@
			}


			List<string> chooseList = new List<string>();
			chooseList.Add(Language.StringByID(StringId.All));
			List<SpatialInfo> chooseList = new List<SpatialInfo>();
			chooseList.Add(new SpatialInfo() { roomId = "", roomName = Language.StringByID(StringId.All) });
			foreach (var f in SpatialInfo.CurrentSpatial.FloorList)
			{
			chooseList.Add(f.roomName);
			chooseList.Add(f);
			}

			foreach (var floor in chooseList)
			{
			if (floor != Language.StringByID(StringId.All))
			if (!string.IsNullOrEmpty( floor.roomId))// != Language.StringByID(StringId.All))
			{
			//---分割线
			contentView.AddChidren(new Button()
			{
			Gravity = Gravity.CenterHorizontal,
			@@ -898,20 +921,20 @@
			TextAlignment = TextAlignment.CenterLeft,
			TextColor = CSS_Color.FirstLevelTitleColor,
			SelectedTextColor = CSS_Color.MainColor,
			Text = floor,
			Text = floor.roomName,
			TextSize = CSS_FontSize.SubheadingFontSize,
			IsSelected = btnFloor.Text == floor,
			IsMoreLines = true,
			Tag = floor
			IsSelected = floor.roomId == DB_ResidenceData.Instance.ClassificationChooseFloor.roomId,
			//IsMoreLines = true,
			};
			contentView.AddChidren(btnHomeName);

			btnHomeName.MouseUpEventHandler += (senderH, en) =>
			{
			dialog.Close();
			btnFloor.Text = floor;
			btnFloor.Text = floor.roomName;
			DB_ResidenceData.Instance.ClassificationChooseFloor = floor;
			roomsShowed.Clear();
			if (floor == Language.StringByID(StringId.All))
			if (string.IsNullOrEmpty(floor.roomId))
			{
			roomsShowed.AddRange(SpatialInfo.CurrentSpatial.RoomList);
			}
			@@ -919,7 +942,7 @@
			{
			foreach (var room in SpatialInfo.CurrentSpatial.RoomList)
			{
			if (room.floorName == floor)
			if (room.parentId == floor.uid)
			{
			roomsShowed.Add(room);
			}
			@@ -940,6 +963,6 @@
			{

			}
			#endregion
			#endregion
			}
			}