From bbaae33cad1dadaad27eeac712d30fff248bffa5 Mon Sep 17 00:00:00 2001 From: WJC <wjc@hdlchina.com.cn> Date: 星期二, 17 三月 2020 17:46:25 +0800 Subject: [PATCH] 2020-03-17-2 --- ZigbeeApp/Shared/Phone/UserCenter/DoorLock/MasterManagementPage.cs | 68 +++++++++++++++++++--------------- 1 files changed, 38 insertions(+), 30 deletions(-) diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/MasterManagementPage.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/MasterManagementPage.cs old mode 100644 new mode 100755 index b4f5a1d..b49e762 --- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/MasterManagementPage.cs +++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/MasterManagementPage.cs @@ -16,13 +16,19 @@ BackgroundColor = Shared.Common.ZigbeeColor.Current.GXCTopViewBackgroundColor; } - #region 鈼� 鍙橀噺鐢虫槑__________________________ + #region 鍙橀噺鐢虫槑 + /// <summary> + /// 褰撳墠闂ㄩ攣 + /// </summary> ZigBee.Device.DoorLock doorLock; + /// <summary> + /// 褰撳墠璐︽埛 + /// </summary> Shared.Phone.UserCenter.MemberInfoRes accountObj; #endregion /// <summary> - /// UI鏄剧ず + /// UI鏄剧ず /// </summary> public void Show() { @@ -47,6 +53,9 @@ MidFrameLayoutContent(); } + /// <summary> + /// 涓儴甯冨眬 + /// </summary> public void MidFrameLayoutContent() { var bodyView = new VerticalRefreshLayout() @@ -87,7 +96,7 @@ Y = Application.GetRealHeight(58), Height = Application.GetRealHeight(58), Width = Application.GetRealWidth(58), - UnSelectedImagePath = "Item/Next.png", + UnSelectedImagePath = "Item/RightNext.png", SelectedImagePath = "Item/Down.png", }; RowView.AddChidren(btnRight); @@ -123,31 +132,30 @@ unLockMethod.Show(); } else - { - - ///澶囨敞锛歐JC鐨� - ///璁板綍褰撳墠鐢ㄦ埛淇℃伅 - Phone.Device.Logic.Send.UserMemberInfoRes = accountObj; - Phone.Device.Logic.Send.CurrentDoorLock = doorLock; - if (accountObj == null) - { - ///闃叉鎶涘紓甯� - Phone.Device.Logic.Send.UserMemberInfoRes = new MemberInfoRes(); - } - if (doorLock == null) - { - ///闃叉鎶涘紓甯� - Phone.Device.Logic.Send.CurrentDoorLock = new ZigBee.Device.DoorLock(); - } - ///杩涙潵鍒锋柊涓�娆¤澶囧垪琛紱 - Common.Logic.LogicDviceList.Clear(); - if (Common.Logic.LogicDviceList.Count == 0) - { - Common.Logic.LogicDviceList.AddRange(LocalDevice.Current.listAllDevice.ToArray()); - } - var doorLockLogicList = new Phone.Device.Logic.DoorLockLogic.LockLogicList(); - UserView.HomePage.Instance.AddChidren(doorLockLogicList); - UserView.HomePage.Instance.PageIndex += 1; + { + ///澶囨敞锛歐JC鐨� + ///璁板綍褰撳墠鐢ㄦ埛淇℃伅 + Phone.Device.Logic.Send.UserMemberInfoRes = accountObj; + Phone.Device.Logic.Send.CurrentDoorLock = doorLock; + if (accountObj == null) + { + ///闃叉鎶涘紓甯� + Phone.Device.Logic.Send.UserMemberInfoRes = new MemberInfoRes(); + } + if (doorLock == null) + { + ///闃叉鎶涘紓甯� + Phone.Device.Logic.Send.CurrentDoorLock = new ZigBee.Device.DoorLock(); + } + ///杩涙潵鍒锋柊涓�娆¤澶囧垪琛紱 + Common.Logic.LogicDviceList.Clear(); + if (Common.Logic.LogicDviceList.Count == 0) + { + Common.Logic.LogicDviceList.AddRange(LocalDevice.Current.listAllDevice.ToArray()); + } + var doorLockLogicList = new Phone.Device.Logic.DoorLockLogic.LockLogicList(); + UserView.HomePage.Instance.AddChidren(doorLockLogicList); + UserView.HomePage.Instance.PageIndex += 1; doorLockLogicList.Show(); } }; @@ -157,7 +165,7 @@ } } - #region 鈼� 鎺ュ彛瀹炵幇__________________________ + #region 鎺ュ彛瀹炵幇 /// <summary> /// 澶勭悊鍙樺寲浜嬩欢 --灏嗗純鐢� 鏀圭敤DeviceInfoChange() /// </summary> @@ -191,4 +199,4 @@ } #endregion } -} +} \ No newline at end of file -- Gitblit v1.8.0