From e28d283bd27db2c40ff435c517db54e2010e8ae6 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期二, 24 十二月 2019 14:31:56 +0800
Subject: [PATCH] 2019.12.24
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/SafetyMasterControl.cs | 59 +++++++++++++++--------------------------------------------
1 files changed, 15 insertions(+), 44 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..54939ae 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,7 @@
//濡傛灉璁剧疆鏈夊唴閮ㄩ槻鍖�
string msg = string.Empty;
if (HdlSafeguardLogic.Current.IsHadInternalDefenseArea() == true)
-
- {
+ {
//鍦ㄥ甯冮槻璁剧疆鎴愬姛
msg = Language.StringByID(R.MyInternationalizationString.uSetAtHomeGarrisonSuccess);
}
@@ -169,18 +168,8 @@
//甯冮槻璁剧疆鎴愬姛
msg = Language.StringByID(R.MyInternationalizationString.uSetGarrisonSuccess);
}
-
- if (UserCenterResourse.DicActionForm.ContainsKey("SafetyManagementMainForm") == true)
- {
- //娣诲姞甯冮槻涓婃姤鐨勮鎺т欢
- var form = (Safety.SafetyManagementMainForm)UserCenterResourse.DicActionForm["SafetyManagementMainForm"];
- form?.AddSafeguardLogPushRow(null);
- }
- else
- {
- var control = new ShowMsgControl(ShowMsgType.Tip, msg);
- control.Show();
- }
+ var control = new ShowMsgControl(ShowMsgType.Tip, msg);
+ control.Show();
});
}
@@ -209,19 +198,10 @@
{
return;
}
- if (UserCenterResourse.DicActionForm.ContainsKey("SafetyManagementMainForm") == true)
- {
- //娣诲姞甯冮槻涓婃姤鐨勮鎺т欢
- var form = (Safety.SafetyManagementMainForm)UserCenterResourse.DicActionForm["SafetyManagementMainForm"];
- form?.AddSafeguardLogPushRow(null);
- }
- else
- {
- //绂诲甯冮槻璁剧疆鎴愬姛
- string msg = Language.StringByID(R.MyInternationalizationString.uSetRemoveHomeGarrisonSuccess);
- var control = new ShowMsgControl(ShowMsgType.Tip, msg);
- control.Show();
- }
+ //绂诲甯冮槻璁剧疆鎴愬姛
+ string msg = Language.StringByID(R.MyInternationalizationString.uSetRemoveHomeGarrisonSuccess);
+ var control = new ShowMsgControl(ShowMsgType.Tip, msg);
+ control.Show();
});
}
@@ -246,19 +226,10 @@
//鏍规嵁甯冮槻妯″紡锛岃缃浘鏍囩殑閫夋嫨鐘舵��
this.SetIconStatuByGarrisonMode(GarrisonMode.RemoveGarrison);
- if (UserCenterResourse.DicActionForm.ContainsKey("SafetyManagementMainForm") == true)
- {
- //娣诲姞甯冮槻涓婃姤鐨勮鎺т欢
- var form = (Safety.SafetyManagementMainForm)UserCenterResourse.DicActionForm["SafetyManagementMainForm"];
- form?.AddSafeguardLogPushRow(null);
- }
- else
- {
- //绂诲甯冮槻璁剧疆鎴愬姛
- string msg = Language.StringByID(R.MyInternationalizationString.uRemoveGarrisonSuccess);
- var control = new ShowMsgControl(ShowMsgType.Tip, msg);
- control.Show();
- }
+ //绂诲甯冮槻璁剧疆鎴愬姛
+ string msg = Language.StringByID(R.MyInternationalizationString.uRemoveGarrisonSuccess);
+ var control = new ShowMsgControl(ShowMsgType.Tip, msg);
+ control.Show();
});
}
@@ -373,7 +344,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