~wjc/HomeApp.git

			@@ -248,7 +248,8 @@
			//自动化
			else if (UserCenterResourse.ResidenceOption.CategoryPageSwitchIndex == 2)
			{
			this.ShowAutotion();
			//自动化功能代码入口
			Device.Logic.SkipView.ShowAutotionView(functionSceneAutoBodyView);
			//隐藏楼层
			floorVisible = false;
			//显示右上角的加号
			@@ -315,7 +316,7 @@
			functionSceneBodyView.Height = functionSceneAutoBodyView.Height - roomSwitchContr.Bottom;
			functionSceneAutoBodyView.AddChidren(functionSceneBodyView);

			//执行初始化
			//执行初始化
			roomSwitchContr.InitControl();
			}

			@@ -506,56 +507,56 @@
			//窗帘
			if (device.Type == DeviceType.WindowCoveringDevice)
			{
			cardContr = new Controls.DeviceCurtainRowControl(listView.rowSpace / 2);
			cardContr = new Controls.DeviceCurtainRowControl();
			}
			//继电器
			else if (device.Type == DeviceType.OnOffOutput)
			{
			cardContr = new Controls.DeviceRelayRowControl(listView.rowSpace / 2);
			cardContr = new Controls.DeviceRelayRowControl();
			}
			//空气开关
			else if (device.Type == DeviceType.AirSwitch)
			{
			cardContr = new Controls.DeviceAirSwitchRowControl(listView.rowSpace / 2);
			cardContr = new Controls.DeviceAirSwitchRowControl();
			}
			//空调
			else if (device.Type == DeviceType.Thermostat)
			{
			cardContr = new Controls.DeviceAcRowControl(listView.rowSpace / 2);
			cardContr = new Controls.DeviceAcRowControl();
			}
			// 新风
			else if (device.Type == DeviceType.FreshAir)
			{
			cardContr = new Controls.DeviceFreshAirRowControl(listView.rowSpace / 2);
			cardContr = new Controls.DeviceFreshAirRowControl();
			}
			//彩灯(调光器)
			else if (device.Type == DeviceType.DimmableLight)
			{
			cardContr = new Controls.DeviceColorLightRowControl(listView.rowSpace / 2);
			cardContr = new Controls.DeviceColorLightRowControl();
			}
			//传感器
			else if (device.Type == DeviceType.IASZone)
			{
			cardContr = new Controls.DeviceSensorRowControl(listView.rowSpace / 2);
			cardContr = new Controls.DeviceSensorRowControl();
			}
			//温湿度
			else if (device.Type == DeviceType.TemperatureSensor)
			{
			cardContr = new Controls.DeviceTemperatureRowControl(listView.rowSpace / 2);
			cardContr = new Controls.DeviceTemperatureRowControl();
			}
			//门锁
			else if (device.Type == DeviceType.DoorLock)
			{
			cardContr = new Controls.DeviceDoorLockRowControl(listView.rowSpace / 2);
			cardContr = new Controls.DeviceDoorLockRowControl();
			}
			//无法识别
			else
			{
			cardContr = new Controls.DeviceRowCommon(listView.rowSpace / 2);
			cardContr = new Controls.DeviceRowCommon();
			//没有状态功能
			cardContr.hadStatuFunction = false;
			}

			cardContr.chidrenYaxis = listView.rowSpace / 2;
			//初始化卡片
			listView.AddChidren(cardContr);
			cardContr.InitControl(device);
			@@ -639,7 +640,7 @@
			listview2 = new VerticalListControl();
			functionSceneBodyView.AddChidren(listview2);
			}


			foreach (var scene in listScene)
			{
			//场景卡片控件
			@@ -832,7 +833,8 @@
			if (this.dicDeviceRowControl.ContainsKey(mainKeys) == true)
			{
			//刷新卡片状态
			this.dicDeviceRowControl[mainKeys].SetRowOnlineStatu(report.IsOnline == 1);
			bool bolOnline = LocalDevice.Current.CheckDeviceIsOnline(report);
			this.dicDeviceRowControl[mainKeys].SetRowOnlineStatu(bolOnline);
			return;
			}

			@@ -1009,18 +1011,6 @@
			/// 设备回路主键
			/// </summary>
			public List<string> listDeviceKeys = new List<string>();
			}

			#endregion

			#region ◆ 自动化__________________________

			/// <summary>
			/// 自动化功能代码入口
			/// </summary>
			private void ShowAutotion()
			{
			Shared.Phone.Device.Logic.SkipView.ShowAutotionView(functionSceneAutoBodyView);
			}

			#endregion