From c0021397eeb8335d6d1f20990c71533c3d94e7af Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期五, 10 一月 2020 17:02:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-tzy' into DEV_GXC
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/SafetyMasterControl.cs | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/SafetyMasterControl.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/SafetyMasterControl.cs
index abc30df..e5428f4 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/SafetyMasterControl.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/SafetyMasterControl.cs
@@ -54,21 +54,21 @@
this.frameTable = new FrameLayout();
frameTable.Height = this.Height;
frameTable.Width = this.Width;
- frameTable.Radius = 20;
+ frameTable.Radius = (uint)Application.GetRealHeight(58);
frameTable.BackgroundColor = UserCenterColor.Current.White;
this.AddChidren(frameTable);
//鍙充笂鍦嗚鑳屾櫙
var btnTopRight = new NormalViewControl(150, 60, true);
btnTopRight.BackgroundColor = UserCenterColor.Current.White;
- btnTopRight.Radius = 6;
+ btnTopRight.RadiusEx = 17;
this.AddChidren(btnTopRight);
btnTopRight.X = this.Width - btnTopRight.Width;
//宸︿笅鍦嗚鑳屾櫙
var btnBottomRight = new NormalViewControl(150, 60, true);
btnBottomRight.BackgroundColor = UserCenterColor.Current.White;
- btnBottomRight.Radius = 6;
+ btnBottomRight.RadiusEx = 17;
this.AddChidren(btnBottomRight);
btnBottomRight.Y = this.Height - btnBottomRight.Height;
--
Gitblit v1.8.0