From f17bb6c60db1f24ce05df96aa27d4680e2df0ce6 Mon Sep 17 00:00:00 2001 From: xm <1271024303@qq.com> Date: 星期三, 15 一月 2020 17:16:13 +0800 Subject: [PATCH] 请合并最新代码,(优化代码格式,完成开会后的细节测试) --- ZigbeeApp20190114/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs | 40 +++++++++++++++++++++++++++++++++------- 1 files changed, 33 insertions(+), 7 deletions(-) diff --git a/ZigbeeApp20190114/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs b/ZigbeeApp20190114/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs index d35d7e1..64aaf3b 100644 --- a/ZigbeeApp20190114/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs +++ b/ZigbeeApp20190114/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs @@ -6,7 +6,11 @@ { public class UserDoorLockPage : DoorLockCommonLayout, ZigBee.Common.IStatus { - + /// <summary> + /// 鏋勯�犲嚱鏁� + /// </summary> + /// <param name="room"></param> + /// <param name="doorLock"></param> public UserDoorLockPage(Shared.Common.Room room, DeviceUI doorLock) { this.doorLock = doorLock.CommonDevice as ZigBee.Device.DoorLock; @@ -16,12 +20,30 @@ ZigBee.Device.ZbGateway.StatusList.Add(this); } - #region 鈼� 鍙橀噺鐢虫槑__________________________ + #region 鍙橀噺鐢虫槑 + /// <summary> + /// 褰撳墠闂ㄩ攣 + /// </summary> ZigBee.Device.DoorLock doorLock; + /// <summary> + /// 搴曢儴甯冨眬 + /// </summary> FrameLayout bottomFrameLayout; + /// <summary> + /// 褰撳墠鎴块棿 + /// </summary> Shared.Common.Room currentRoom; + /// <summary> + /// 璁惧UI瀵硅薄 + /// </summary> DeviceUI deviceUI; + /// <summary> + /// 璁剧疆浜屾楠岃瘉Action + /// </summary> Action action; + /// <summary> + /// 涓儴甯冨眬涓棬閿佸悕绉版樉绀� + /// </summary> Button btnDoorLockTitle; #endregion @@ -85,7 +107,9 @@ MidFrameLayoutContent(); } - + /// <summary> + /// 涓儴甯冨眬 + /// </summary> public void MidFrameLayoutContent() { #region UI @@ -326,9 +350,10 @@ TextSize = 12, TextAlignment = TextAlignment.CenterLeft, }; - btnCurrentFrameLayout.AddChidren(btnCurrentRoomName); + btnCurrentFrameLayout.AddChidren(btnCurrentRoomName); #endregion - + + #region 鏁版嵁澶勭悊 EventHandler<MouseEventArgs> hander1 = async (sender, e) => { openFrameLayout.Enable = false; @@ -394,10 +419,11 @@ progressButton.Y = Application.GetRealHeight(347); }; closeFrameLayout.MouseUpEventHandler += hander2; - btnDoorClosePic.MouseUpEventHandler += hander2; + btnDoorClosePic.MouseUpEventHandler += hander2; + #endregion } - #region 鈼� 鎺ュ彛瀹炵幇__________________________ + #region 鎺ュ彛瀹炵幇 /// <summary> /// 澶勭悊鍙樺寲浜嬩欢 --灏嗗純鐢� 鏀圭敤DeviceInfoChange() /// </summary> -- Gitblit v1.8.0