~wxr/HDL_APP_Project.git

			@@ -442,41 +442,41 @@
			{
			case ShowFunction.Light:
			#region Light
			functionCount = FunctionList.List.lights.Count;
			functionOnCount = FunctionList.List.lights.FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
			functionCount = FunctionList.List.GetLightList().Count;
			functionOnCount = FunctionList.List.GetLightList().FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
			#endregion
			break;
			case ShowFunction.AC:
			#region AC
			functionCount = FunctionList.List.aCs.Count;
			functionOnCount = FunctionList.List.aCs.FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
			functionCount = FunctionList.List.GetAcList().Count;
			functionOnCount = FunctionList.List.GetAcList().FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
			#endregion
			break;
			case ShowFunction.Curtain:
			#region Curtain
			functionCount = FunctionList.List.curtains.Count;
			functionOnCount = FunctionList.List.curtains.FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
			functionCount = FunctionList.List.GetCurtainList().Count;
			functionOnCount = FunctionList.List.GetCurtainList().FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
			#endregion
			break;
			case ShowFunction.FloorHeating:
			#region 地热
			functionCount = FunctionList.List.floorHeatings.Count;
			functionOnCount = FunctionList.List.floorHeatings.FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
			functionCount = FunctionList.List.GetFloorHeatingList().Count;
			functionOnCount = FunctionList.List.GetFloorHeatingList().FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
			#endregion
			break;
			case ShowFunction.DoorLock:
			break;
			case ShowFunction.Electric:
			#region 电器
			functionCount = FunctionList.List.electricals.Count;
			functionOnCount = FunctionList.List.electricals.FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
			functionCount = FunctionList.List.GetElectricals().Count;
			functionOnCount = FunctionList.List.GetElectricals().FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
			#endregion
			break;
			case ShowFunction.EnergyMonitoring:
			break;
			case ShowFunction.Environmental:
			#region 环境数据
			functionCount = FunctionList.List.sensorsEnvironmentalScience.Count;
			functionCount = FunctionList.List.GetEnvirSensorsList().Count;
			#endregion
			break;
			case ShowFunction.FreshAir:
			@@ -491,7 +491,7 @@
			functionCount = 1;
			break;
			case ShowFunction.Sensor:
			functionCount = FunctionList.List.sensorsArm.Count;
			functionCount = FunctionList.List.GetArmSensorList().Count;
			break;
			case ShowFunction.VideoIntercom:
			break;
			@@ -597,8 +597,6 @@
			case ShowFunction.Light:
			#region Light
			btnName.TextID = StringId.Lights;
			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),
			@@ -617,14 +615,12 @@
			LoadEvent_SwitchFunction(btnLightPower, item, functionView);
			};
			functionPageTitleId = StringId.Lights;


			#endregion
			break;
			case ShowFunction.AC:
			#region AC
			btnName.TextID = StringId.AC;
			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),
			@@ -647,8 +643,6 @@
			case ShowFunction.Curtain:
			#region Curtain
			btnName.TextID = StringId.Curtain;
			functionCount = FunctionList.List.curtains.Count;
			functionOnCount = FunctionList.List.curtains.FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
			Button btnClose;
			btnClose = new Button()
			{
			@@ -682,8 +676,6 @@
			case ShowFunction.FloorHeating:
			#region 地热
			btnName.TextID = StringId.FloorHeating;
			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),
			@@ -709,8 +701,6 @@
			case ShowFunction.Electric:
			#region 电器
			btnName.TextID = StringId.Electric;
			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),
			@@ -750,8 +740,6 @@
			break;
			case ShowFunction.Music:
			btnName.TextID = StringId.Music;
			functionCount = Music.A31MusicModel.A31MusicModelList.Count;
			functionOnCount = Music.A31MusicModel.A31MusicModelList.FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
			btnFunctionViewBg.MouseUpEventHandler = (sender, e) =>
			{
			var musicMain = new Music.MusicMain();
			@@ -767,19 +755,11 @@
			btnName.TextID = StringId.SecurityMonitoring;
			btnFunctionViewBg.MouseUpEventHandler = (sender, e) =>
			{

			#if __IOS__
			EZSDK.IOS.EZSDK.Go2EZvizMonitor();
			#else //安卓摄像头
			((BaseActivity)Shared.Application.Activity).SetCamera(b =>
			{
			if (b)
			{
			Android.Content.Intent intent = new Android.Content.Intent();
			intent.SetComponent(new Android.Content.ComponentName(Shared.Application.Activity, "com.videogo.MainActivity"));
			Shared.Application.Activity.StartActivity(intent);
			}
			});

			HDLCommon.Current.Go2EZvizMonitor(bodyView);
			#endif
			};
			break;