~wjc/HomeApp.git

			@@ -2,6 +2,7 @@
			using System.Collections.Generic;
			using Shared.Common;
			using Shared.Phone.Device.CommonForm;
			using Shared.Phone.Device.DeviceLogic;
			using Shared.Phone.UserView;
			using ZigBee.Device;
			namespace Shared.Phone.Device.Light
			@@ -19,7 +20,7 @@
			/// <summary>
			/// The action.
			/// </summary>
			public Action action;
			public Action<CommonDevice, Common.Room> action;

			/// <summary>
			/// The light image.
			@@ -32,7 +33,7 @@
			/// <summary>
			/// 传过来的设备
			/// </summary>
			private DeviceUI device;
			private CommonDevice device;
			/// <summary>
			/// 传过来的房间
			/// </summary>
			@@ -62,34 +63,14 @@

			private Button StatuBtn;

			/// <summary>
			/// IsDrawerLockMode
			/// </summary>
			public bool IsDrawerLockMode;
			#endregion

			#region ◆ 接口__________________________
			/// <summary>
			/// 处理变化事件 --将弃用改用DeviceInfoChange()
			/// </summary>
			/// <returns>The changed.</returns>
			/// <param name="common">Common.</param>
			public void Changed(CommonDevice common)
			{

			}
			/// <summary>
			/// Changeds the IL ogic status.
			/// </summary>
			/// <param name="logic">Logic.</param>
			public void ChangedILogicStatus(ZigBee.Device.Logic logic)
			{
			//throw new NotImplementedException();
			}
			/// <summary>
			/// Changeds the IS cene status.
			/// </summary>
			/// <param name="scene">Scene.</param>
			public void ChangedISceneStatus(Scene scene)
			{
			//throw new NotImplementedException();
			}

			/// <summary>
			/// 设备状态更新接口
			/// <para>type：如果为 DeviceInComingRespon:设备新上报</para>
			@@ -110,20 +91,20 @@
			{
			var deviceUI = device;
			//设备为空
			if (deviceUI.CommonDevice == null)
			if (deviceUI == null)
			{
			return;
			}
			//是否为当前设备
			if (deviceUI.CommonDevice.DeviceEpoint != common.DeviceEpoint \|\| deviceUI.CommonDevice.DeviceAddr != common.DeviceAddr)
			if (deviceUI.DeviceEpoint != common.DeviceEpoint \|\| deviceUI.DeviceAddr != common.DeviceAddr)
			{
			return;
			}
			if (deviceUI.CommonDevice.Type == DeviceType.OnOffOutput)
			if (deviceUI.Type == DeviceType.OnOffOutput)
			{
			if (common.DeviceStatusReport.CluterID == 6)
			{
			var light = deviceUI.CommonDevice as ToggleLight;
			var light = deviceUI as ToggleLight;
			light.DeviceStatusReport = common.DeviceStatusReport;
			//记录、更新状态
			if (light.DeviceStatusReport.AttriBute == null \|\| light.DeviceStatusReport.AttriBute.Count == 0)
			@@ -132,7 +113,7 @@
			}
			light.OnOffStatus = light.DeviceStatusReport.AttriBute[0].AttriButeData;
			deviceIMG.IsSelected = switchBtn.IsSelected = light.OnOffStatus == 1;
			StatuBtn.Text = CommonFormResouce.GetSwitchStatu(deviceIMG.IsSelected);
			StatuBtn.Text = Language.StringByID(R.MyInternationalizationString.Current) + " " + UserCenter.HdlDeviceOtherLogic.Current.GetDeviceStatu(device);
			light.LastDateTime = DateTime.Now;
			}
			}
			@@ -145,7 +126,29 @@
			}
			else if (typeTag == "OnlineStatusChange")
			{

			Application.RunOnMainThread(() =>
			{
			try
			{
			var deviceUI = device;
			//设备为空
			if (deviceUI == null)
			{
			return;
			}
			//是否为当前设备
			if (deviceUI.DeviceEpoint != common.DeviceEpoint \|\| deviceUI.DeviceAddr != common.DeviceAddr)
			{
			return;
			}
			deviceUI.IsOnline = common.IsOnline;
			deviceUI.LastDateTime = DateTime.Now;
			}
			catch (Exception ex)
			{
			System.Console.WriteLine($"Error:{ex.Message}");
			}
			});
			}
			}
			#endregion
			@@ -157,8 +160,12 @@
			public override void RemoveFromParent()
			{
			ZbGateway.StatusList.Remove(this);
			//action();
			//action = null;
			action(device, room);
			action = null;
			if (IsDrawerLockMode)
			{
			CommonPage.Instance.IsDrawerLockMode = false;
			}
			RemoveUpdateControlDeviceStatuAction();
			base.RemoveFromParent();
			}
			@@ -176,10 +183,10 @@
			/// </summary>
			/// <param name="dev">Device.</param>
			/// <param name="room">Room.</param>
			public void Show(DeviceUI dev,Shared.Common.Room room)
			public void Show(CommonDevice dev,Shared.Common.Room room)
			{
			device = dev;
			zbGateway = this.device.CommonDevice.Gateway;
			zbGateway = this.device.Gateway;
			this.room = room;

			AddTop();
			@@ -187,7 +194,7 @@
			AddBodyView(device);


			var light = dev.CommonDevice as ToggleLight;
			var light = dev as ToggleLight;
			//补上非远程
			if (light.Gateway == null)
			{
			@@ -197,8 +204,7 @@
			{
			UserHomeView.ReadStatus(light, () =>
			{
			light.ReadOnOffStatus();
			light.ReadAttri(Cluster_ID.Identify, AttriButeId.Switch);
			ReadDeviceAttributeLogic.Instance.SendLightStatuComand(device);
			});
			}
			else
			@@ -206,13 +212,11 @@
			//防止短时间内多次读取状态
			if (CommonPage.ReadDeviceStatuSpan < (DateTime.Now - light.LastDateTime).TotalSeconds)
			{
			light.ReadOnOffStatus();
			light.ReadAttri(Cluster_ID.Identify, AttriButeId.Switch);
			ReadDeviceAttributeLogic.Instance.SendLightStatuComand(device);
			}
			}

			var de = Shared.Common.Room.LoveRoomDeviceUIFilePathList.Find((obj) => obj == device.FileName);
			if (de == null)
			if(UserCenter.HdlRoomLogic.Current.IsCollectInRoom(device) == false)
			{
			collectionBtn.IsSelected = false;
			}
			@@ -243,15 +247,6 @@
			RemoveFromParent();
			};

			var sharedBtn = new Button
			{
			X = Application.GetRealWidth(850),
			Width = Application.GetMinReal(69),
			Height = Application.GetMinReal(69),
			Gravity = Gravity.CenterVertical,
			UnSelectedImagePath = "Item/Shared.png"
			};
			top.topView.AddChidren(sharedBtn);

			var moreBtn = new Button
			{
			@@ -269,7 +264,7 @@
			/// <summary>
			/// AddBodyView
			/// </summary>
			public void AddBodyView(DeviceUI device)
			public void AddBodyView(CommonDevice device)
			{
			bodyFrameLayout = new FrameLayout()
			{
			@@ -307,9 +302,10 @@
			Width=Application.GetRealWidth(500),
			Height = Application.GetRealHeight(60),
			Gravity = Gravity.CenterHorizontal,
			Text = device.CommonDevice.DeviceEpointName,
			Text = Common.LocalDevice.Current.GetDeviceEpointName(device),
			TextColor = ZigbeeColor.Current.GXCTextBlackColor,
			TextSize=15
			TextSize=15,
			IsBold=true
			};
			itemView.AddChidren(deviceNameBtn);

			@@ -320,9 +316,11 @@
			Height = Application.GetRealHeight(60),
			Gravity = Gravity.CenterHorizontal,
			TextColor = ZigbeeColor.Current.GXCTextGrayColor,
			Text=CommonFormResouce.GetSwitchStatu(device.CommonDevice.IsOnline==1)
			Text = Language.StringByID(R.MyInternationalizationString.Current) + " " + UserCenter.HdlDeviceOtherLogic.Current.GetDeviceStatu(device),
			TextSize = 10
			};
			itemView.AddChidren(StatuBtn);


			deviceIMG = new Button()
			{
			@@ -332,7 +330,7 @@
			Gravity = Gravity.CenterHorizontal,
			UnSelectedImagePath = "Light/DeskLamp.png",
			SelectedImagePath = "Light/DeskLampSelected.png",
			IsSelected = (device.CommonDevice as ToggleLight).OnOffStatus == 1
			IsSelected = (device as ToggleLight).OnOffStatus == 1
			};
			itemView.AddChidren(deviceIMG);

			@@ -344,7 +342,7 @@
			Gravity = Gravity.CenterHorizontal,
			UnSelectedImagePath = "Item/Switch.png",
			SelectedImagePath = "Item/SwitchSelected.png",
			IsSelected = (device.CommonDevice as ToggleLight).OnOffStatus == 1
			IsSelected = (device as ToggleLight).OnOffStatus == 1
			};
			itemView.AddChidren(switchBtn);

			@@ -383,7 +381,8 @@
			Height = Application.GetRealHeight(50),
			Text = room.Name,
			TextAlignment = TextAlignment.CenterLeft,
			TextColor = ZigbeeColor.Current.GXCTextWhiteColor
			TextColor = ZigbeeColor.Current.GXCTextWhiteColor,
			TextSize=12
			};
			itemView.AddChidren(roomName);
			}
			@@ -416,17 +415,26 @@
			zbGateway.ReportAction += UpdateDeviceControllStatu;
			switchBtn.IsSelected = !switchBtn.IsSelected;
			deviceIMG.IsSelected = !deviceIMG.IsSelected;
			StatuBtn.Text = CommonFormResouce.GetSwitchStatu(deviceIMG.IsSelected);
			StatuBtn.Text = Language.StringByID(R.MyInternationalizationString.Current) + " ";
			if (deviceIMG.IsSelected == true)
			{
			StatuBtn.Text += Language.StringByID(R.MyInternationalizationString.uOpen1);
			}
			else
			{
			StatuBtn.Text += Language.StringByID(R.MyInternationalizationString.Close);
			}

			if (switchBtn.IsSelected == true)
			{
			(device.CommonDevice as ToggleLight).SwitchControl(1);
			(device as ToggleLight).SwitchControl(1);
			}
			else
			{
			(device.CommonDevice as ToggleLight).SwitchControl(0);
			(device as ToggleLight).SwitchControl(0);
			}
			//控制延时回调
			DeviceUI.SendCommandDelayAction(device.CommonDevice, () =>
			UserCenter.HdlDeviceOtherLogic.Current.SendCommandDelayAction(device, () =>
			{
			if(Parent==null)
			{
			@@ -435,7 +443,7 @@
			RemoveUpdateControlDeviceStatuAction();
			if (sendedControlCommand==false)
			{
			DeviceUI.ShowStatuTip(R.MyInternationalizationString.FAIL);
			UserCenter.HdlDeviceOtherLogic.Current.ShowStatuTip(R.MyInternationalizationString.FAIL);
			}
			});
			}
			@@ -456,9 +464,9 @@
			UserView.HomePage.Instance.AddChidren(detailInfo);
			UserView.HomePage.Instance.PageIndex += 1;
			detailInfo.Show(device, room);
			detailInfo.action = () =>
			detailInfo.EditAction += (curDev, curRoom) =>
			{
			Show(device, room);
			Show(curDev, curRoom);
			};
			}

			@@ -475,12 +483,12 @@
			//collection
			if ((sender as Button).IsSelected)
			{
			Shared.Common.Room.CurrentRoom.GetLoveRoom().DeleteDevice(device.FileName);
			UserCenter.HdlRoomLogic.Current.DeleteLoveDevice(device);
			(sender as Button).IsSelected = false;
			}
			else
			{
			Shared.Common.Room.CurrentRoom.GetLoveRoom().AddDevice(device.FileName);
			{
			UserCenter.HdlRoomLogic.Current.AddLoveDevice(device);
			(sender as Button).IsSelected = true;
			}
			}
			@@ -505,7 +513,7 @@
			return;
			}
			var tempDevice = (CommonDevice)objValue;
			if (tempDevice.DeviceEpoint != this.device.CommonDevice.DeviceEpoint \|\| tempDevice.DeviceAddr != this.device.CommonDevice.DeviceAddr)
			if (tempDevice.DeviceEpoint != this.device.DeviceEpoint \|\| tempDevice.DeviceAddr != this.device.DeviceAddr)
			{
			//不是当前设备的推送，则不处理
			return;