2019.11.15

gxc

2019-11-15 aa3d6459c82a97f8f6f504d8a678814fc1089ab5

 ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs

old mode 100755
new mode 100644
@@ -6,11 +6,13 @@
{
    public class UserDoorLockPage : DoorLockCommonLayout, ZigBee.Common.IStatus
    {
        public UserDoorLockPage(ZigBee.Device.DoorLock doorLock, Shared.Phone.UserCenter.MemberInfoRes accountObj)

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

@@ -18,6 +20,7 @@
        ZigBee.Device.DoorLock doorLock;
        FrameLayout bottomFrameLayout;
        Shared.Common.Room currentRoom;
        DeviceUI deviceUI;
        Action action;
        #endregion

@@ -141,11 +144,11 @@
                btnCollect.IsSelected = !btnCollect.IsSelected;
                if (btnCollect.IsSelected)
                {
                    // Shared.Common.Room.CurrentRoom.GetLoveRoom().DeleteDevice(doorLock.FileName); //取消收藏
                    Shared.Common.Room.CurrentRoom.GetLoveRoom().DeleteDevice(deviceUI.FileName); //取消收藏
                }
                else
                {
                    //Shared.Common.Room.CurrentRoom.GetLoveRoom().AddDevice(doorLock.FileName);//收藏
                    Shared.Common.Room.CurrentRoom.GetLoveRoom().AddDevice(deviceUI.FileName);//收藏
                }
            };

@@ -279,7 +282,7 @@
                Height = Application.GetRealHeight(49),
                X = Application.GetRealWidth(150),
                Y = Application.GetRealHeight(46),
                // Text = currentRoom.Name,
                Text = currentRoom.Name,
                TextColor = Shared.Common.ZigbeeColor.Current.XMWhite,
                TextSize = 12,
                TextAlignment = TextAlignment.CenterLeft,