From 00ab3ddb140ba8bb88b5cf572b004a85e1da85e9 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期四, 02 一月 2020 19:51:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-tzy' into DEV_GXC

---
 ZigbeeApp/Shared/Phone/UserCenter/Device/DoorLock/DoorLockScreeningTypeForm.cs |    7 ++-----
 1 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/DoorLock/DoorLockScreeningTypeForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/DoorLock/DoorLockScreeningTypeForm.cs
index 996b9ef..90cfa37 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/DoorLock/DoorLockScreeningTypeForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/DoorLock/DoorLockScreeningTypeForm.cs
@@ -154,9 +154,6 @@
             this.InitUserSelectControl(dicUser, detailBackFrame, btnLine.Bottom);
             //鍒濆鍖栭�夋嫨寮�閿佹柟寮忔帶浠�
             this.InitUnLockSelectControl(detailBackFrame, btnLine.Bottom);
-
-            //鍔ㄧ敾鏁堟灉
-            frameTransparent.Animate = Animate.DownToUp;
         }
 
         #endregion
@@ -306,7 +303,7 @@
         private NormalViewControl InitUserSelectButton(bool select)
         {
             var btnContr = new NormalViewControl(207, 63, true);
-            btnContr.Radius = 6;
+            btnContr.RadiusEx = 17;
             btnContr.TextAlignment = TextAlignment.Center;
             if (select == false)
             {
@@ -367,7 +364,7 @@
         private NormalViewControl InitLockSelectButton(bool select)
         {
             var btnContr = new NormalViewControl(207, 63, true);
-            btnContr.Radius = 6;
+            btnContr.RadiusEx = 17;
             btnContr.TextAlignment = TextAlignment.Center;
             if (select == false)
             {

--
Gitblit v1.8.0