From 9c16d3614d9b88c637f967518a329f239fcd3aaf Mon Sep 17 00:00:00 2001
From: lss <316519258@qq.com>
Date: 星期五, 12 六月 2020 09:22:04 +0800
Subject: [PATCH] 2020.06.12
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/SafetyMasterControl.cs | 63 ++++++++++++++++++-------------
1 files changed, 36 insertions(+), 27 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/SafetyMasterControl.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/SafetyMasterControl.cs
index 54939ae..5dd649b 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) =>
{
@@ -129,11 +138,11 @@
#endregion
- #region 鈻� 甯冮槻鎾ら槻___________________________
+ #region 鈻� 甯冮槻鎾ら槻___________________________
/// <summary>
/// 鍦ㄥ甯冮槻
- /// </summary>
+ /// </summary>
private async void SetSafetyGarrisonModeInAtHome()
{
//鎵撳紑杩涘害鏉�
@@ -171,11 +180,11 @@
var control = new ShowMsgControl(ShowMsgType.Tip, msg);
control.Show();
});
- }
-
+ }
+
/// <summary>
/// 绂诲甯冮槻
- /// </summary>
+ /// </summary>
private async void SetSafetyGarrisonModeInRemoveHome()
{
//鎵撳紑杩涘害鏉�
@@ -203,11 +212,11 @@
var control = new ShowMsgControl(ShowMsgType.Tip, msg);
control.Show();
});
- }
-
+ }
+
/// <summary>
/// 鎾ら槻
- /// </summary>
+ /// </summary>
private async void RemoveSafetyGarrisonMode()
{
//鎵撳紑杩涘害鏉�
@@ -231,12 +240,12 @@
var control = new ShowMsgControl(ShowMsgType.Tip, msg);
control.Show();
});
- }
-
+ }
+
/// <summary>
/// 鏍规嵁甯冮槻妯″紡锛岃缃浘鏍囩殑閫夋嫨鐘舵��
/// </summary>
- /// <param name="mode"></param>
+ /// <param name="mode"></param>
public void SetIconStatuByGarrisonMode(GarrisonMode mode)
{
//鍦ㄥ甯冮槻
@@ -268,7 +277,7 @@
/// <summary>
/// 璁剧疆甯冮槻鎸夐挳鐨勫彲瑙嗙姸鎬�
- /// </summary>
+ /// </summary>
public void SetButtonVisible()
{
//璁剧疆鏈夊唴閮ㄩ槻鍖�
@@ -294,7 +303,7 @@
/// <summary>
/// 灏佽鐨勫竷闃叉帶浠�
/// </summary>
- private class GarrisonControl : FrameLayoutControl
+ private class GarrisonControl : FrameLayoutStatuControl
{
#region 鈻� 鍙橀噺澹版槑___________________________
@@ -341,18 +350,18 @@
this.RemoveBaseClickEvent();
//鑳屾櫙
- int backHeight = Application.GetMinRealAverage(132);
+ int backHeight = this.GetPictrueRealSize(132);
btnBack = new NormalViewControl(backHeight, backHeight, false);
btnBack.Gravity = Gravity.CenterHorizontal;
btnBack.Radius = (uint)backHeight / 2;
btnBack.BackgroundColor = UserCenterColor.Current.BodyFrameLayout;
- this.AddChidren(btnBack, ChidrenBindMode.BindEventOnly);
+ this.AddChidren(btnBack, ChidrenBindMode.BindEvent);
//鍥炬爣
btnIcon = new IconViewControl(81);
btnIcon.Y = Application.GetRealHeight(26);
btnIcon.Gravity = Gravity.CenterHorizontal;
- this.AddChidren(btnIcon, ChidrenBindMode.BindEventOnly);
+ this.AddChidren(btnIcon, ChidrenBindMode.BindEvent);
//鏂囨湰
btnText = new NormalViewControl(this.Width, Application.GetRealHeight(58), false);
--
Gitblit v1.8.0