~wjc/HomeApp.git

old mode 100755 new mode 100644

			@@ -72,8 +72,11 @@
			private readonly int sleepSpan = 300;


			private FrameLayout itemView;

			private FrameLayout itemView=new FrameLayout();
			/// <summary>
			/// floorBtn
			/// </summary>
			private Button floorBtn;
			#endregion

			#region ◆ 接口____________________________
			@@ -128,10 +131,10 @@
			{
			case DeviceType.OnOffOutput:
			//开关功能
			if (common.DeviceStatusReport.CluterID == 6)
			if ((common as ZigBee.Device.ToggleLight).DeviceStatusReport.CluterID == 6)
			{
			var onOffOutputLight = deviceUI.CommonDevice as ZigBee.Device.ToggleLight;
			onOffOutputLight.DeviceStatusReport = common.DeviceStatusReport;
			onOffOutputLight.DeviceStatusReport = (common as ZigBee.Device.ToggleLight).DeviceStatusReport;

			//记录、更新状态
			if (onOffOutputLight.DeviceStatusReport.AttriBute == null \|\| onOffOutputLight.DeviceStatusReport.AttriBute.Count == 0)
			@@ -149,10 +152,10 @@

			case DeviceType.AirSwitch:
			//开关功能
			if (common.DeviceStatusReport.CluterID == 6)
			if ((common as ZigBee.Device.AirSwitch).DeviceStatusReport.CluterID == 6)
			{
			var airSwitch = deviceUI.CommonDevice as ZigBee.Device.AirSwitch;
			airSwitch.DeviceStatusReport = common.DeviceStatusReport;
			airSwitch.DeviceStatusReport = (common as ZigBee.Device.AirSwitch).DeviceStatusReport;
			for (int j = 0; j < frameLayout.ChildrenCount; j++)
			{
			var tempView = frameLayout.GetChildren(j);
			@@ -175,7 +178,7 @@
			}
			}
			//当CluterID=3,就证明该设备在线，直接标记
			if (common.DeviceStatusReport.CluterID == 3)
			if ((common as ZigBee.Device.AirSwitch).DeviceStatusReport.CluterID == 3)
			{
			var airSwitch = deviceUI.CommonDevice as AirSwitch;
			airSwitch.IsOnline = 1;
			@@ -197,18 +200,18 @@
			break;

			case DeviceType.WindowCoveringDevice:
			if (common.DeviceStatusReport.CluterID == 258)
			if ((common as Rollershade).DeviceStatusReport.CluterID == 258)
			{
			if (common.DeviceStatusReport.AttriBute[0].AttributeId == 0)
			if ((common as Rollershade).DeviceStatusReport.AttriBute[0].AttributeId == 0)
			{
			//窗帘类型
			var rollerShade = deviceUI.CommonDevice as Rollershade;
			rollerShade.DeviceStatusReport = common.DeviceStatusReport;
			rollerShade.WcdType = common.DeviceStatusReport.AttriBute[0].AttriButeData;
			rollerShade.DeviceStatusReport = (common as Rollershade).DeviceStatusReport;
			rollerShade.WcdType = (common as Rollershade).DeviceStatusReport.AttriBute[0].AttriButeData;
			rollerShade.LastDateTime = DateTime.Now;
			}
			}
			if (common.DeviceStatusReport.CluterID == 3)
			if ((common as ZigBee.Device.Rollershade).DeviceStatusReport.CluterID == 3)
			{
			var rollershade = deviceUI.CommonDevice as ZigBee.Device.Rollershade;
			rollershade.IsOnline = 1;
			@@ -231,10 +234,10 @@

			case DeviceType.Thermostat:
			//AC功能
			if (common.DeviceStatusReport.CluterID == 513)
			if ((common as ZigBee.Device.AC).DeviceStatusReport.CluterID == 513)
			{
			var ac = deviceUI.CommonDevice as ZigBee.Device.AC;
			ac.DeviceStatusReport = common.DeviceStatusReport;
			ac.DeviceStatusReport = (common as ZigBee.Device.AC).DeviceStatusReport;
			var attriButeList = ac.DeviceStatusReport.AttriBute;
			if (attriButeList == null \|\| attriButeList.Count == 0)
			{
			@@ -297,7 +300,7 @@

			}
			//当CluterID=3,就证明该设备在线，直接标记
			if (common.DeviceStatusReport.CluterID == 3)
			if ((common as ZigBee.Device.AC).DeviceStatusReport.CluterID == 3)
			{
			var ac = deviceUI.CommonDevice as AC;
			ac.IsOnline = 1;
			@@ -322,10 +325,10 @@
			case DeviceType.DimmableLight:
			//调光灯功能
			//开关功能
			if (common.DeviceStatusReport.CluterID == 6)
			if ((common as DimmableLight).DeviceStatusReport.CluterID == 6)
			{
			var dimmableLight = deviceUI.CommonDevice as DimmableLight;
			dimmableLight.DeviceStatusReport = common.DeviceStatusReport;
			dimmableLight.DeviceStatusReport = (common as DimmableLight).DeviceStatusReport;
			//记录、更新状态
			if (dimmableLight.DeviceStatusReport.AttriBute == null \|\| dimmableLight.DeviceStatusReport.AttriBute.Count == 0)
			{
			@@ -339,10 +342,10 @@
			}

			//亮度
			if (common.DeviceStatusReport.CluterID == 8)
			if ((common as ZigBee.Device.DimmableLight).DeviceStatusReport.CluterID == 8)
			{
			var dimmableLight = deviceUI.CommonDevice as ZigBee.Device.DimmableLight;
			dimmableLight.DeviceStatusReport = common.DeviceStatusReport;
			dimmableLight.DeviceStatusReport = (common as ZigBee.Device.DimmableLight).DeviceStatusReport;
			var attriButeList = dimmableLight.DeviceStatusReport.AttriBute;
			if (attriButeList == null \|\| attriButeList.Count == 0)
			{
			@@ -452,7 +455,7 @@
			};
			topFrameLayout.AddChidren(floor);

			var floorBtn = new Button
			floorBtn = new Button
			{
			X=floor.Right,
			Width=Application.GetRealWidth(500),
			@@ -492,18 +495,8 @@
			}
			AddChidren(residecneName);

			EventHandler<MouseEventArgs> selectFloor = (send, e) =>
			{
			var floorFL = new Phone.Device.Category.SelectFloor();
			AddChidren(floorFL);
			floorFL.Init(35,153);
			floorFL.FloorAction = (floorName) =>
			{
			floorBtn.Text = floorName;
			};
			};
			floor.MouseUpEventHandler += selectFloor;
			floorBtn.MouseUpEventHandler += selectFloor;
			floor.MouseUpEventHandler += SelectFloor;
			floorBtn.MouseUpEventHandler += SelectFloor;
			//切换住宅
			residecneName.MouseLongEventHandler += (send, e) =>
			{
			@@ -684,7 +677,7 @@
			{
			//Room.CurrentRoom = Room.CurrentRoom == null ? Room.Lists[0] : Room.CurrentRoom;
			Room.CurrentRoom = Room.Lists[0];
			foreach (var room in Room.Lists)
			foreach (var room in Room.CurrentRoom.GetRoomsByCurrentFloorIdAppendLoveRoom())
			{
			var roomBackView = new FrameLayout()
			{
			@@ -729,7 +722,10 @@
			//{
			// Show();
			//};

			if(room.IsLove)
			{
			return;
			}
			var editRoom = new Device.Room.EditRoom();
			HomePage.Instance.AddChidren(editRoom);
			HomePage.Instance.PageIndex += 1;
			@@ -859,7 +855,9 @@
			#endregion

			#region ◆ 刷新____________________________

			/// <summary>
			/// RefreshBodyView
			/// </summary>
			public void RefreshBodyView()
			{
			if (Room.CanInitAllRoom == false)
			@@ -875,6 +873,23 @@
			{
			ShowScene();
			}
			}

			/// <summary>
			/// SelectFloor
			/// </summary>
			/// <param name="sender"></param>
			/// <param name="mouseEventArgs"></param>
			public void SelectFloor(object sender,MouseEventArgs mouseEventArgs)
			{
			var floorFL = new Phone.Device.Category.SelectFloor();
			AddChidren(floorFL);
			floorFL.Init(35, 153);
			floorFL.FloorAction = (floorName) =>
			{
			floorBtn.Text = floorName;
			Show();
			};
			}

			#endregion
			@@ -1073,12 +1088,12 @@
			{
			if ((sender as Button).IsSelected)
			{
			Shared.Common.Room.GetLoveRoom().DeleteDevice(device.FileName);
			Shared.Common.Room.CurrentRoom.GetLoveRoom().DeleteDevice(device.FileName);
			(sender as Button).IsSelected = false;
			}
			else
			{
			Shared.Common.Room.GetLoveRoom().AddDevice(device.FileName);
			Shared.Common.Room.CurrentRoom.GetLoveRoom().AddDevice(device.FileName);
			(sender as Button).IsSelected = true;
			}
			if (Room.CurrentRoom.IsLove)
			@@ -2379,7 +2394,7 @@
			sceneView.Init();
			sceneView.SetSceneNameText(scene.Name);
			sceneView.SetIcon($"SceneIcon/{i}.png");
			sceneView.SetCollect(scene.IsCollected);
			sceneView.SetCollect(Common.Room.CurrentRoom.GetLoveRoom().SceneUIFilePathList.Contains(scene.FileName));

			if (scene.SceneDelayTime == 0)
			{
			@@ -2439,17 +2454,30 @@
			//收藏
			EventHandler<MouseEventArgs> collectionEvent = (sender, e) =>
			{
			(sender as Button).IsSelected = !(sender as Button).IsSelected;
			if ((sender as Button).IsSelected)
			{
			scene.Collect(false);
			(sender as Button).IsSelected = false;
			//scene.IsCollected = true;
			Room.CurrentRoom.GetLoveRoom().AddScene(scene);
			}
			else
			{
			scene.Collect(true);
			(sender as Button).IsSelected = true;
			//scene.IsCollected = false;
			Room.CurrentRoom.GetLoveRoom().RemoveScene(scene);
			}
			scene.Save();

			//if ((sender as Button).IsSelected)
			//{
			// scene.Collect(false);
			// (sender as Button).IsSelected = false;
			//}
			//else
			//{
			// scene.Collect(true);
			// (sender as Button).IsSelected = true;
			//}
			//scene.Save();
			//if (Room.CurrentRoom.IsLove)
			//{
			// RefreshBodyView();