From 4ce5177289b1d34e467de9d8790836559cc5a09e Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 18 十一月 2019 18:06:28 +0800
Subject: [PATCH] 合并了全部的代码

---
 ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs |   54 ++++++++++++++++++++++++++++++++++++------------------
 1 files changed, 36 insertions(+), 18 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs
index 4044118..504a952 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs
@@ -6,10 +6,12 @@
 {
     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, 
+            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
 
@@ -44,14 +47,22 @@
             };
             this.titleFrameLayout.AddChidren(btnShare);
 
+            var btnFuncSetFrameLayout = new FrameLayout
+            {
+                X = Application.GetRealWidth(850 - 116),
+                Height = Application.GetRealHeight(69),
+                Width = Application.GetRealWidth(69 * 2 + 58),
+            };
+            this.titleFrameLayout.AddChidren(btnFuncSetFrameLayout);
+
             var btnFuncSet = new Button
             {
-                X = Application.GetRealWidth(953 - 116),
+                X = Application.GetRealWidth(103),
                 Height = Application.GetRealHeight(69),
                 Width = Application.GetRealWidth(69),
                 UnSelectedImagePath = "DoorLock/SettingIcon.png",
             };
-            this.titleFrameLayout.AddChidren(btnFuncSet);
+            btnFuncSetFrameLayout.AddChidren(btnFuncSet);
             btnFuncSet.MouseDownEventHandler += (sender, e) =>
             {
                 if (UserCenterResourse.UserInfo.AuthorityNo == 1)
@@ -119,11 +130,9 @@
             midTopFrameLayout.AddChidren(btnRecord);
             btnRecord.MouseDownEventHandler += (sender, e) =>
             {
-                var doorLock = new ZigBee.Device.DoorLock();
-                var doorLockRecord = new Shared.Phone.UserCenter.DoorLock.HistoryRecordPage(doorLock);
-                Shared.Phone.UserView.HomePage.Instance.AddChidren(doorLockRecord);
-                Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
-                doorLockRecord.Show();
+                //鍘嗗彶璁板綍 ----   stan
+                var form = new DeviceDoorLock.DoorLockHistoryLogForm();
+                form.AddForm(this.doorLock.DeviceAddr);
             };
 
             var btnCollect = new Button()
@@ -135,17 +144,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(doorLock.FileName); //鍙栨秷鏀惰棌
+                    Shared.Common.Room.CurrentRoom.GetLoveRoom().AddDevice(deviceUI.FileName);//鏀惰棌
                 }
                 else
-                {
-                    //Shared.Common.Room.CurrentRoom.GetLoveRoom().AddDevice(doorLock.FileName);//鏀惰棌
+                {
+                    Shared.Common.Room.CurrentRoom.GetLoveRoom().DeleteDevice(deviceUI.FileName); //鍙栨秷鏀惰棌
                 }
             };
 
@@ -188,7 +206,7 @@
 
             var btnFrameLayout = new FrameLayout()
             {
-                Width = Application.GetRealWidth(420 - 46),//639-35
+                Width = Application.GetRealWidth(420 - 46),
                 Height = Application.GetRealHeight(446),
                 X = btnDoorLockPic.Right,
                 Y = Application.GetRealHeight(354),
@@ -279,7 +297,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,
@@ -301,12 +319,12 @@
                          }
                          else
                          {
-                             new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.NoAccess), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(this.btnTip);
+                             new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.NoAccess), Direction = AMPopTipDirection.Down, CloseTime = 1 }.Show(Common.CommonPage.Instance);
                          }
                      }
                      else
                      {
-                         new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.AccountIsFreezed), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(this.btnTip);
+                         new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.AccountIsFreezed), Direction = AMPopTipDirection.Down, CloseTime = 1 }.Show(Common.CommonPage.Instance);
                      }
                  }
                  else

--
Gitblit v1.8.0