~wjc/HomeApp.git

			@@ -7,6 +7,7 @@
			using Shared.Phone.Device.CommonForm;
			using Shared.Phone.Device.AC;
			using Shared.Phone.UserCenter.DoorLock;
			using Shared.Phone.Device.DeviceLogic;

			namespace Shared.Phone.Device.Category
			{
			@@ -484,8 +485,9 @@
			Gravity = Gravity.CenterVertical,
			TextAlignment = TextAlignment.CenterLeft,
			TextID = R.MyInternationalizationString.Category,
			TextSize = 20,
			TextSize = 24,
			TextColor = ZigbeeColor.Current.GXCTextDeepBlackColor,
			IsBold=true
			};
			topView.AddChidren(title);

			@@ -842,6 +844,7 @@
			//deviceListScrolView.SetCornerWithSameRadius(Application.GetRealHeight(50), HDLUtils.RectCornerTopLeft);

			tempFunctionTypeBtn = new FunctionButton();
			tempFunctionTypeBtn.Init("","");

			EventHandler<MouseEventArgs> ShowSameTypeFunction = (object typeSender, MouseEventArgs mouseEventArgs) =>
			{
			@@ -910,8 +913,7 @@
			{
			UserHomeView.ReadStatus(light, () =>
			{
			light.ReadOnOffStatus();
			light.ReadAttri(Cluster_ID.Identify, AttriButeId.Switch);
			ReadDeviceAttributeLogic.Instance.SendLightStatuComand(deviceUI.CommonDevice);
			});
			}
			else
			@@ -919,8 +921,7 @@
			//防止短时间内多次读取状态
			if (CommonPage.ReadDeviceStatuSpan < (DateTime.Now - light.LastDateTime).TotalSeconds)
			{
			light.ReadOnOffStatus();
			light.ReadAttri(Cluster_ID.Identify, AttriButeId.Switch);
			ReadDeviceAttributeLogic.Instance.SendLightStatuComand(deviceUI.CommonDevice);
			}
			}

			@@ -1005,16 +1006,18 @@
			Tag = deviceUI,
			Radius = 0
			};
			deviceTypeRowLayout.AddRightView(editBtn);
			editBtn.MouseUpEventHandler += deviceDetailHandler;

			var delBtn = new Device.CommonForm.RowLayoutDeleteButton()
			{
			Tag = deviceUI,
			Radius = 0
			};
			deviceTypeRowLayout.AddRightView(delBtn);
			delBtn.MouseUpEventHandler += delEvent;
			if (room.IsSharedRoom == false)
			{
			deviceTypeRowLayout.AddRightView(editBtn);
			editBtn.MouseUpEventHandler += deviceDetailHandler;
			deviceTypeRowLayout.AddRightView(delBtn);
			delBtn.MouseUpEventHandler += delEvent;
			}
			}
			else if (deviceUI.CommonDevice.Type == ZigBee.Device.DeviceType.AirSwitch)
			{
			@@ -1029,16 +1032,14 @@
			{
			UserHomeView.ReadStatus(airSwitch, () =>
			{
			airSwitch.ReadOnOffStatus();
			airSwitch.ReadAttri(Cluster_ID.Identify, AttriButeId.Switch);
			ReadDeviceAttributeLogic.Instance.SendLightStatuComand(deviceUI.CommonDevice);
			});
			}
			else
			{
			if ((DateTime.Now - airSwitch.LastDateTime).TotalSeconds > CommonPage.ReadDeviceStatuSpan)
			{
			airSwitch.ReadOnOffStatus();
			airSwitch.ReadAttri(Cluster_ID.Identify, AttriButeId.Switch);
			ReadDeviceAttributeLogic.Instance.SendLightStatuComand(deviceUI.CommonDevice);
			}
			}

			@@ -1105,16 +1106,19 @@
			Tag = deviceUI,
			Radius = 0
			};
			deviceTypeRowLayout.AddRightView(editBtn);
			editBtn.MouseUpEventHandler += deviceDetailHandler;

			var delBtn = new Device.CommonForm.RowLayoutDeleteButton()
			{
			Tag = deviceUI,
			Radius = 0
			};
			deviceTypeRowLayout.AddRightView(delBtn);
			delBtn.MouseUpEventHandler += delEvent;
			if (room.IsSharedRoom == false)
			{
			deviceTypeRowLayout.AddRightView(editBtn);
			editBtn.MouseUpEventHandler += deviceDetailHandler;
			deviceTypeRowLayout.AddRightView(delBtn);
			delBtn.MouseUpEventHandler += delEvent;
			}

			}
			else if (deviceUI.CommonDevice.Type == ZigBee.Device.DeviceType.DimmableLight)
			{
			@@ -1129,18 +1133,14 @@
			{
			UserHomeView.ReadStatus(dimmableLight, () =>
			{
			dimmableLight.ReadAttri(Cluster_ID.Identify, AttriButeId.Switch);
			dimmableLight.ReadOnOffStatus();
			dimmableLight.ReadLevel();
			ReadDeviceAttributeLogic.Instance.SendDimmableLightStatuComand(deviceUI.CommonDevice);
			});
			}
			else
			{
			if ((DateTime.Now - dimmableLight.LastDateTime).TotalSeconds > CommonPage.ReadDeviceStatuSpan)
			{
			dimmableLight.ReadAttri(Cluster_ID.Identify, AttriButeId.Switch);
			dimmableLight.ReadOnOffStatus();
			dimmableLight.ReadLevel();
			ReadDeviceAttributeLogic.Instance.SendDimmableLightStatuComand(deviceUI.CommonDevice);
			}
			}

			@@ -1207,17 +1207,18 @@
			Tag = deviceUI,
			Radius = 0
			};
			deviceTypeRowLayout.AddRightView(editBtn);
			editBtn.MouseUpEventHandler += deviceDetailHandler;

			var delBtn = new Device.CommonForm.RowLayoutDeleteButton()
			{
			Tag = deviceUI,
			Radius = 0
			};
			deviceTypeRowLayout.AddRightView(delBtn);
			delBtn.MouseUpEventHandler += delEvent;

			if (room.IsSharedRoom == false)
			{
			deviceTypeRowLayout.AddRightView(editBtn);
			editBtn.MouseUpEventHandler += deviceDetailHandler;
			deviceTypeRowLayout.AddRightView(delBtn);
			delBtn.MouseUpEventHandler += delEvent;
			}
			}
			else if (deviceUI.CommonDevice.Type == ZigBee.Device.DeviceType.Thermostat)
			{
			@@ -1233,16 +1234,7 @@
			//发送读取状态命令
			UserView.UserHomeView.ReadStatus(ac, () =>
			{
			ac.ReadAttri(Cluster_ID.Identify, AttriButeId.Switch);
			ac.ReadLocalTemperature();
			ac.ReadCoolingSetpoint();
			ac.ReadHeatingSetpoint();
			ac.ReadAutoSetpoint();
			ac.ReadFanMode();
			ac.ReadSystemMode();
			ac.ReadSystemFansSwingMode();
			ac.ReadModeSupport();
			ac.ReadCleanStatu();
			ReadDeviceAttributeLogic.Instance.SendACStatuComand(deviceUI.CommonDevice);
			});
			}
			else
			@@ -1250,16 +1242,7 @@
			//防止短时间内多次读取设备状态
			if ((DateTime.Now - ac.LastDateTime).TotalSeconds > CommonPage.ReadDeviceStatuSpan)
			{
			ac.ReadAttri(Cluster_ID.Identify, AttriButeId.Switch);
			ac.ReadLocalTemperature();
			ac.ReadCoolingSetpoint();
			ac.ReadHeatingSetpoint();
			ac.ReadAutoSetpoint();
			ac.ReadFanMode();
			ac.ReadSystemMode();
			ac.ReadSystemFansSwingMode();
			ac.ReadModeSupport();
			ac.ReadCleanStatu();
			ReadDeviceAttributeLogic.Instance.SendACStatuComand(deviceUI.CommonDevice);
			}
			}

			@@ -1316,16 +1299,18 @@
			Tag = deviceUI,
			Radius = 0
			};
			deviceTypeRowLayout.AddRightView(editBtn);
			editBtn.MouseUpEventHandler += deviceDetailHandler;

			var delBtn = new Device.CommonForm.RowLayoutDeleteButton()
			{
			Tag = deviceUI,
			Radius = 0
			};
			deviceTypeRowLayout.AddRightView(delBtn);
			delBtn.MouseUpEventHandler += delEvent;
			if (room.IsSharedRoom == false)
			{
			deviceTypeRowLayout.AddRightView(editBtn);
			editBtn.MouseUpEventHandler += deviceDetailHandler;
			deviceTypeRowLayout.AddRightView(delBtn);
			delBtn.MouseUpEventHandler += delEvent;
			}

			deviceRow.ClickBtn.MouseUpEventHandler += (send2, e2) =>
			{
			@@ -1350,8 +1335,7 @@
			{
			UserHomeView.ReadStatus(rollerShade, () =>
			{
			rollerShade.ReadAttri(Cluster_ID.Identify, AttriButeId.Switch);
			rollerShade.ReadWcdCurrentPositionLiftPercentage();
			ReadDeviceAttributeLogic.Instance.SendCurtainStatuComand(deviceUI.CommonDevice);
			});
			}
			else
			@@ -1359,8 +1343,7 @@
			//防止短时间内多次读取
			if ((DateTime.Now - rollerShade.LastDateTime).TotalSeconds > CommonPage.ReadDeviceStatuSpan)
			{
			rollerShade.ReadAttri(Cluster_ID.Identify, AttriButeId.Switch);
			rollerShade.ReadWcdCurrentPositionLiftPercentage();
			ReadDeviceAttributeLogic.Instance.SendCurtainStatuComand(deviceUI.CommonDevice);
			}
			}

			@@ -1403,16 +1386,18 @@
			Tag = deviceUI,
			Radius = 0
			};
			deviceTypeRowLayout.AddRightView(editBtn);
			editBtn.MouseUpEventHandler += deviceDetailHandler;

			var delBtn = new Device.CommonForm.RowLayoutDeleteButton()
			{
			Tag = deviceUI,
			Radius = 0
			};
			deviceTypeRowLayout.AddRightView(delBtn);
			delBtn.MouseUpEventHandler += delEvent;
			if (room.IsSharedRoom == false)
			{
			deviceTypeRowLayout.AddRightView(editBtn);
			editBtn.MouseUpEventHandler += deviceDetailHandler;
			deviceTypeRowLayout.AddRightView(delBtn);
			delBtn.MouseUpEventHandler += delEvent;
			}

			deviceRow.ClickBtn.MouseUpEventHandler += (send2, e2) =>
			{
			@@ -1455,15 +1440,17 @@
			{
			Tag = deviceUI
			};
			deviceTypeRowLayout.AddRightView(editBtn);
			editBtn.MouseUpEventHandler += deviceDetailHandler;

			var delBtn = new Device.CommonForm.RowLayoutDeleteButton()
			{
			Tag = deviceUI
			};
			deviceTypeRowLayout.AddRightView(delBtn);
			delBtn.MouseUpEventHandler += delEvent;
			if (room.IsSharedRoom == false)
			{
			deviceTypeRowLayout.AddRightView(editBtn);
			editBtn.MouseUpEventHandler += deviceDetailHandler;
			deviceTypeRowLayout.AddRightView(delBtn);
			delBtn.MouseUpEventHandler += delEvent;
			}
			}
			else
			{
			@@ -1487,15 +1474,17 @@
			{
			Tag = deviceUI
			};
			deviceTypeRowLayout.AddRightView(editBtn);
			editBtn.MouseUpEventHandler += deviceDetailHandler;

			var delBtn = new Device.CommonForm.RowLayoutDeleteButton()
			{
			Tag = deviceUI
			};
			deviceTypeRowLayout.AddRightView(delBtn);
			delBtn.MouseUpEventHandler += delEvent;
			if (room.IsSharedRoom == false)
			{
			deviceTypeRowLayout.AddRightView(editBtn);
			editBtn.MouseUpEventHandler += deviceDetailHandler;
			deviceTypeRowLayout.AddRightView(delBtn);
			delBtn.MouseUpEventHandler += delEvent;
			}
			}
			}
			};
			@@ -1647,7 +1636,6 @@
			var sceneView = new SceneCategoryView(0, 0);
			sceneScrolView.AddChidren(sceneView);
			sceneView.Init(scene, room);
			sceneView.SetViewShadow(true);
			GetDelayScene(sceneScrolView);
			}
			}
			@@ -1740,8 +1728,19 @@
			{ IsBackground = true }.Start();
			}

			#endregion
			/// <summary>
			/// GetExecScene
			/// </summary>
			/// <param name="scrolViewLayout"></param>
			private void GetExecScene(VerticalScrolViewLayout scrolViewLayout)
			{
			new System.Threading.Thread(() =>
			{

			})
			{ IsBackground = true }.Start();
			}
			#endregion

			#region ◆ 自动化__________________________

			@@ -1759,11 +1758,11 @@
			Height = Application.GetRealHeight(170),
			BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
			X = Application.GetRealWidth(58),
			Radius = (uint)Application.GetRealHeight(50),
			//Radius = (uint)Application.GetRealHeight(50),
			Y = Application.GetRealHeight(30),
			};
			functionSceneAutoBodyView.AddChidren(bjFrameLayout);

			bjFrameLayout.SetCornerWithSameRadius(25, HDLUtils.RectCornerTopLeft \| HDLUtils.RectCornerBottomLeft);
			var sigBtn = new Button
			{
			Width = Application.GetMinRealAverage(84),
			@@ -1784,6 +1783,7 @@
			TextID = MyInternationalizationString.logictemplate,
			Gravity = Gravity.CenterVertical,
			TextColor = ZigbeeColor.Current.LogicBtnSelectedColor,
			TextSize=15,
			};
			bjFrameLayout.AddChidren(recommendtextBtn);

			@@ -1813,10 +1813,11 @@
			Height = functionSceneAutoBodyView.Height - bjFrameLayout.Height - bjFrameLayout.Y - scenehorizontalScrol.Height - Application.GetRealHeight(30),
			BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor,
			X = Application.GetRealWidth(58),
			Radius = (uint)Application.GetRealHeight(50),
			//Radius = (uint)Application.GetRealHeight(50),
			Y = scenehorizontalScrol.Bottom,
			};
			functionSceneAutoBodyView.AddChidren(logicScrolView);
			logicScrolView.SetCornerWithSameRadius(20, HDLUtils.RectCornerTopLeft \| HDLUtils.RectCornerBottomLeft);


			recommendswitchBtn.MouseUpEventHandler += (sender, e) =>
			@@ -1854,6 +1855,7 @@
			Y = Application.GetRealHeight(246 - 23 - 80),
			TextAlignment = TextAlignment.CenterLeft,
			TextColor = ZigbeeColor.Current.LogicBtnSaveTextColor,
			TextSize = 14,
			};
			frameLayout.AddChidren(logicnameBtn);

			@@ -1964,6 +1966,7 @@
			Y = Application.GetRealHeight(30),
			TextAlignment = TextAlignment.CenterLeft,
			TextColor = ZigbeeColor.Current.LogicTextBlackColor,
			TextSize = 14,
			};
			logicRowlayout.AddChidren(logicnameBtn);