~wjc/HomeApp.git

old mode 100755 new mode 100644

			@@ -7,12 +7,12 @@
			public class UserDoorLockPage : DoorLockCommonLayout, ZigBee.Common.IStatus
			{

			public UserDoorLockPage(Shared.Common.Room room ,DeviceUI doorLock)
			public UserDoorLockPage(Shared.Common.Room room, DeviceUI doorLock)
			{
			this.doorLock = doorLock.CommonDevice as ZigBee.Device.DoorLock;
			currentRoom = room;
			deviceUI = doorLock;
			BackgroundColor = Shared.Common.ZigbeeColor.Current.GXCTopViewBackgroundColor;
			BackgroundColor = Shared.Common.ZigbeeColor.Current.GXCTopViewBackgroundColor;
			ZigBee.Device.ZbGateway.StatusList.Add(this);
			}

			@@ -22,14 +22,15 @@
			Shared.Common.Room currentRoom;
			DeviceUI deviceUI;
			Action action;
			Button btnDoorLockTitle;
			#endregion

			/// <summary>
			/// UI显示
			/// UI显示
			/// </summary>
			public void Show()
			{
			this.TopFrameLayout(this, Language.StringByID(R.MyInternationalizationString.DoorLock));
			this.TopFrameLayout(this, "");

			EventHandler<MouseEventArgs> eHandlerBack = (sender, e) =>
			{
			@@ -37,8 +38,8 @@
			};
			this.btnBack.MouseUpEventHandler += eHandlerBack;
			this.btnBackFrameLayout.MouseUpEventHandler += eHandlerBack;
			this.MidFrameLayout(this);

			this.MidFrameLayout(this);
			var btnShare = new Button
			{
			X = Application.GetRealWidth(850 - 116),
			@@ -67,27 +68,40 @@
			{
			if (UserCenterResourse.UserInfo.AuthorityNo == 1)
			{
			var userDoorLockPage = new Shared.Phone.UserCenter.DoorLock.FunctionSetting(doorLock);
			Shared.Phone.UserView.HomePage.Instance.AddChidren(userDoorLockPage);
			var functionSetting = new Shared.Phone.UserCenter.DoorLock.FunctionSetting(doorLock);
			Shared.Phone.UserView.HomePage.Instance.AddChidren(functionSetting);
			Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
			userDoorLockPage.Show();
			functionSetting.Show();
			functionSetting.devicNameAction += (deviceRename) =>
			{
			if (!string.IsNullOrEmpty(deviceRename))
			{
			btnDoorLockTitle.Text = deviceRename;
			//改房间
			Shared.Common.Room.CurrentRoom.ChangedRoom(deviceUI.CommonDevice, currentRoom.Id);
			deviceUI.CommonDevice.ReSave();
			}
			};
			}
			else
			{
			var userDoorLockPage = new Shared.Phone.UserCenter.DoorLock.FunctionSettingSub(doorLock);
			Shared.Phone.UserView.HomePage.Instance.AddChidren(userDoorLockPage);
			var functionSettingSub = new Shared.Phone.UserCenter.DoorLock.FunctionSettingSub(doorLock);
			Shared.Phone.UserView.HomePage.Instance.AddChidren(functionSettingSub);
			Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
			userDoorLockPage.Show();
			functionSettingSub.Show();
			functionSettingSub.devicNameAction += (deviceRename) =>
			{
			if (!string.IsNullOrEmpty(deviceRename))
			{
			btnDoorLockTitle.Text = deviceRename;
			}
			};
			}
			};

			btnShare.MouseDownEventHandler += (sender, e) =>
			{
			var doorLock = new ZigBee.Device.DoorLock();
			var memberManagement = new Shared.Phone.UserCenter.DoorLock.MemberManagement(doorLock);
			Shared.Phone.UserView.HomePage.Instance.AddChidren(memberManagement);
			Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
			memberManagement.Show();

			};

			MidFrameLayoutContent();
			@@ -106,14 +120,14 @@
			};
			this.midFrameLayout.AddChidren(midTopFrameLayout);

			var btnDoorLockTitle = new Button()
			btnDoorLockTitle = new Button()
			{
			Width = Application.GetRealWidth(250),
			Height = Application.GetRealHeight(60),
			X = Application.GetRealWidth(372),
			Y = Application.GetRealHeight(46),
			TextColor = Shared.Common.ZigbeeColor.Current.XMGray3,
			Text = Language.StringByID(R.MyInternationalizationString.SmartDoorLock),
			Text = string.IsNullOrEmpty(doorLock.DeviceName) ? Language.StringByID(R.MyInternationalizationString.UNKnown) : doorLock.DeviceName,
			TextSize = 15,
			TextAlignment = TextAlignment.Center,
			};
			@@ -144,17 +158,26 @@
			UnSelectedImagePath = "Item/Collection.png",
			SelectedImagePath = "Item/CollectionSelected.png"
			};
			midTopFrameLayout.AddChidren(btnCollect);
			midTopFrameLayout.AddChidren(btnCollect);
			var de = Shared.Common.Room.LoveRoomDeviceUIFilePathList.Find((obj) => obj == deviceUI.FileName);
			if (de == null)
			{
			btnCollect.IsSelected = false;
			}
			else
			{
			btnCollect.IsSelected = true;
			}
			btnCollect.MouseDownEventHandler += (sender, e) =>
			{
			btnCollect.IsSelected = !btnCollect.IsSelected;
			if (btnCollect.IsSelected)
			{
			Shared.Common.Room.CurrentRoom.GetLoveRoom().DeleteDevice(deviceUI.FileName); //取消收藏
			Shared.Common.Room.CurrentRoom.GetLoveRoom().AddDevice(deviceUI.FileName);//收藏
			}
			else
			{
			Shared.Common.Room.CurrentRoom.GetLoveRoom().AddDevice(deviceUI.FileName);//收藏
			{
			Shared.Common.Room.CurrentRoom.GetLoveRoom().DeleteDevice(deviceUI.FileName); //取消收藏
			}
			};

			@@ -306,7 +329,17 @@
			var result1 = await Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.GetDoorLockUnlockAccess(doorLock, Shared.Common.Config.Instance.Guid);
			if (result1 == true)
			{
			RemoteUnlockRequest(doorLock, action, progressButton, btnDoorLockPic, btnStatus);
			RemoteUnlockRequest(doorLock, action, progressButton, btnDoorLockPic, btnStatus, btnDoorLockTitle);
			devicNameSecAction += (deviceRename) =>
			{
			if (!string.IsNullOrEmpty(deviceRename))
			{
			btnDoorLockTitle.Text = deviceRename;
			//改房间
			Shared.Common.Room.CurrentRoom.ChangedRoom(deviceUI.CommonDevice, currentRoom.Id);
			deviceUI.CommonDevice.ReSave();
			}
			};
			}
			else
			{
			@@ -320,7 +353,17 @@
			}
			else
			{
			RemoteUnlockRequest(doorLock, action, progressButton, btnDoorLockPic, btnStatus);
			RemoteUnlockRequest(doorLock, action, progressButton, btnDoorLockPic, btnStatus, btnDoorLockTitle);
			devicNameSecAction += (deviceRename) =>
			{
			if (!string.IsNullOrEmpty(deviceRename))
			{
			btnDoorLockTitle.Text = deviceRename;
			//改房间
			Shared.Common.Room.CurrentRoom.ChangedRoom(deviceUI.CommonDevice, currentRoom.Id);
			deviceUI.CommonDevice.ReSave();
			}
			};
			}
			};
			openFrameLayout.MouseUpEventHandler += hander1;