From 2109463fab2eb1caed189e4f258e0e763c5cea7b Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期四, 07 十一月 2019 11:58:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-tzy' into dev-wjc
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/SafetyMasterControl.cs | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/SafetyMasterControl.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/SafetyMasterControl.cs
index 70913a4..80e2c5c 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/SafetyMasterControl.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/SafetyMasterControl.cs
@@ -36,7 +36,7 @@
this.Gravity = Gravity.CenterHorizontal;
this.Width = Application.GetRealWidth(964);
this.Height = Application.GetRealHeight(340);
- this.Radius = (uint)Application.GetMinRealAverage(20);
+ this.Radius = 20;
this.BackgroundColor = UserCenterColor.Current.White;
}
@@ -52,14 +52,14 @@
//鍙充笂鍦嗚鑳屾櫙
var btnTopRight = new NormalViewControl(50, 50, true);
btnTopRight.BackgroundColor = UserCenterColor.Current.White;
- btnTopRight.Radius = (uint)Application.GetMinRealAverage(6);
+ btnTopRight.Radius = 6;
this.AddChidren(btnTopRight);
btnTopRight.X = this.Width - btnTopRight.Width;
//宸︿笅鍦嗚鑳屾櫙
var btnBottomRight = new NormalViewControl(50, 50, true);
btnBottomRight.BackgroundColor = UserCenterColor.Current.White;
- btnBottomRight.Radius = (uint)Application.GetMinRealAverage(6);
+ btnBottomRight.Radius = 6;
this.AddChidren(btnBottomRight);
btnBottomRight.Y = this.Height - btnBottomRight.Height;
@@ -159,8 +159,8 @@
//濡傛灉璁剧疆鏈夊唴閮ㄩ槻鍖�
string msg = string.Empty;
if (HdlSafeguardLogic.Current.IsHadInternalDefenseArea() == true)
-
- {
+
+ {
//鍦ㄥ甯冮槻璁剧疆鎴愬姛
msg = Language.StringByID(R.MyInternationalizationString.uSetAtHomeGarrisonSuccess);
}
@@ -373,7 +373,7 @@
int backHeight = Application.GetMinRealAverage(132);
btnBack = new NormalViewControl(backHeight, backHeight, false);
btnBack.Gravity = Gravity.CenterHorizontal;
- btnBack.Radius = (uint)backHeight;
+ btnBack.Radius = (uint)backHeight / 2;
btnBack.BackgroundColor = UserCenterColor.Current.BodyFrameLayout;
this.AddChidren(btnBack, ChidrenBindMode.BindEventOnly);
--
Gitblit v1.8.0