From a4d525d08da7b6fb985b0069c539c11b06306a9b Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期三, 13 十一月 2019 16:28:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-tzy' into dev-wjc

---
 ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UnLockMethod.cs |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UnLockMethod.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UnLockMethod.cs
index 7580a18..505e6ea 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UnLockMethod.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UnLockMethod.cs
@@ -78,7 +78,7 @@
         }
 
         /// <summary>
-        /// UI鏄剧ず 
+        /// UI鏄剧ず
         /// </summary>
         public void Show()
         {
@@ -343,7 +343,7 @@
                     BackgroundColor = Shared.Common.ZigbeeColor.Current.XMDel,
                 };
                 rowFrameLayout.AddRightView(btnDel);
-                #endregion 
+                #endregion
                 #region 鏁版嵁澶勭悊
                 switch (curDoorLockUser.UnlockType)
                 {
@@ -553,7 +553,7 @@
                         }
                     };
                 };
-                #endregion 
+                #endregion
             }
         }
 
@@ -637,7 +637,7 @@
                         btnAllMethod.IsSelected = true;
                         oldbuttonText.TextColor = Shared.Common.ZigbeeColor.Current.XMBlack;
 
-                        // 绫诲瀷鍖哄垎 
+                        // 绫诲瀷鍖哄垎
                         if (doorLock.currentUserDisplayMethod == Language.StringByID(R.MyInternationalizationString.AllMethod))
                         {
                             RefreshList();
@@ -823,7 +823,7 @@
                     BackgroundColor = Shared.Common.ZigbeeColor.Current.XMDel,
                 };
                 rowFrameLayout.AddRightView(btnDel);
-                #endregion 
+                #endregion
                 #region 鏁版嵁澶勭悊
                 switch (curDoorLockUser.UnlockType)
                 {

--
Gitblit v1.8.0