From 3272ca5b51e19f7f8a827b0f68400570a547fe60 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期二, 28 四月 2020 15:02:44 +0800
Subject: [PATCH] 2020-04-28-1
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/SafetyMasterControl.cs | 82 +++++++++++++++-------------------------
1 files changed, 31 insertions(+), 51 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/SafetyMasterControl.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/SafetyMasterControl.cs
index 31075f1..e5428f4 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/SafetyMasterControl.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/SafetyMasterControl.cs
@@ -23,6 +23,10 @@
/// 鎾ら槻
/// </summary>
private GarrisonControl btnReGarrisonGarrison = null;
+ /// <summary>
+ /// 妗屽竷鎺т欢
+ /// </summary>
+ private FrameLayout frameTable = null;
#endregion
@@ -36,8 +40,6 @@
this.Gravity = Gravity.CenterHorizontal;
this.Width = Application.GetRealWidth(964);
this.Height = Application.GetRealHeight(340);
- this.Radius = 20;
- this.BackgroundColor = UserCenterColor.Current.White;
}
/// <summary>
@@ -49,17 +51,24 @@
this.btnReGarrisonGarrison = null;
this.btnRemovehomeGarrison = null;
+ this.frameTable = new FrameLayout();
+ frameTable.Height = this.Height;
+ frameTable.Width = this.Width;
+ frameTable.Radius = (uint)Application.GetRealHeight(58);
+ frameTable.BackgroundColor = UserCenterColor.Current.White;
+ this.AddChidren(frameTable);
+
//鍙充笂鍦嗚鑳屾櫙
- var btnTopRight = new NormalViewControl(50, 50, true);
+ 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(50, 50, true);
+ 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;
@@ -68,7 +77,7 @@
{
//鍦ㄥ甯冮槻
btnAthomeGarrison = new GarrisonControl();
- this.AddChidren(btnAthomeGarrison);
+ frameTable.AddChidren(btnAthomeGarrison);
btnAthomeGarrison.InitControl(GarrisonMode.AtHome);
btnAthomeGarrison.ButtonClickEvent += (sender, e) =>
{
@@ -80,7 +89,7 @@
//绂诲甯冮槻
btnRemovehomeGarrison = new GarrisonControl();
btnRemovehomeGarrison.X = btnAthomeGarrison.Right + Application.GetRealWidth(32);
- this.AddChidren(btnRemovehomeGarrison);
+ frameTable.AddChidren(btnRemovehomeGarrison);
btnRemovehomeGarrison.InitControl(GarrisonMode.RemoveHome);
btnRemovehomeGarrison.ButtonClickEvent += (sender, e) =>
{
@@ -92,7 +101,7 @@
//鎾ら槻
btnReGarrisonGarrison = new GarrisonControl();
btnReGarrisonGarrison.X = btnRemovehomeGarrison.Right + Application.GetRealWidth(32);
- this.AddChidren(btnReGarrisonGarrison);
+ frameTable.AddChidren(btnReGarrisonGarrison);
btnReGarrisonGarrison.InitControl(GarrisonMode.RemoveGarrison);
btnReGarrisonGarrison.ButtonClickEvent += (sender, e) =>
{
@@ -104,7 +113,7 @@
//甯冮槻
btnAthomeGarrison = new GarrisonControl();
btnAthomeGarrison.X = Application.GetRealWidth(166);
- this.AddChidren(btnAthomeGarrison);
+ frameTable.AddChidren(btnAthomeGarrison);
btnAthomeGarrison.InitControl(GarrisonMode.AtHome);
btnAthomeGarrison.ButtonClickEvent += (sender, e) =>
{
@@ -116,7 +125,7 @@
//鎾ら槻
btnReGarrisonGarrison = new GarrisonControl();
btnReGarrisonGarrison.X = btnAthomeGarrison.Right + Application.GetRealWidth(32);
- this.AddChidren(btnReGarrisonGarrison);
+ frameTable.AddChidren(btnReGarrisonGarrison);
btnReGarrisonGarrison.InitControl(GarrisonMode.RemoveGarrison);
btnReGarrisonGarrison.ButtonClickEvent += (sender, e) =>
{
@@ -159,8 +168,7 @@
//濡傛灉璁剧疆鏈夊唴閮ㄩ槻鍖�
string msg = string.Empty;
if (HdlSafeguardLogic.Current.IsHadInternalDefenseArea() == true)
-
- {
+ {
//鍦ㄥ甯冮槻璁剧疆鎴愬姛
msg = Language.StringByID(R.MyInternationalizationString.uSetAtHomeGarrisonSuccess);
}
@@ -169,18 +177,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 +207,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 +235,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();
});
}
--
Gitblit v1.8.0