From 6144d4267f92db9be96a7003f4352732bfe9bb3b Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期四, 19 三月 2020 17:49:31 +0800
Subject: [PATCH] 2020-03-19-1
---
ZigbeeApp/Shared/Phone/Device/Logic/SecurityMode.cs | 109 +++++++++++++++++++-----------------------------------
1 files changed, 39 insertions(+), 70 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/SecurityMode.cs b/ZigbeeApp/Shared/Phone/Device/Logic/SecurityMode.cs
old mode 100755
new mode 100644
index 395bc71..809e2ed
--- a/ZigbeeApp/Shared/Phone/Device/Logic/SecurityMode.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/SecurityMode.cs
@@ -22,56 +22,14 @@
{
#region 鏈�涓婇潰鐨勫竷灞�浠ｇ爜
- var topRowLayout = new RowLayout
- {
- BackgroundColor = ZigbeeColor.Current.LogicTopBackgroundColor,
- Height = Application.GetRealHeight(184),
- LineColor = ZigbeeColor.Current.LogicRowLayoutTopLineColor,
- };
- this.AddChidren(topRowLayout);
-
- var titleName = new Button
- {
- TextSize = 16,
- TextColor = ZigbeeColor.Current.LogicTextBlackColor,
- TextAlignment = TextAlignment.CenterLeft,
- X = Application.GetRealWidth(176),
- Width = Application.GetRealWidth(400),
- Height = Application.GetRealHeight(69),
- Y = Application.GetRealHeight(92),
- TextID = MyInternationalizationString.securitymode,
- };
- topRowLayout.AddChidren(titleName);
-
- var clickBtn = new Button
- {
- Width = Application.GetRealWidth(81 + 51),
- Height = Application.GetRealHeight(58 + 40),
- Y = Application.GetRealHeight(98 - 40),
- };
- topRowLayout.AddChidren(clickBtn);
- clickBtn.MouseDownEventHandler += (sender, e) =>
- {
- RemoveFromParent();
- };
-
- var back = new Button
- {
- Width = Application.GetRealWidth(30),
- Height = Application.GetRealHeight(51),
- X = Application.GetRealWidth(81),
- Y = Application.GetRealHeight(98),
- //Gravity = Gravity.CenterVertical;
- UnSelectedImagePath = "ZigeeLogic/back.png",
- };
- topRowLayout.AddChidren(back);
- back.MouseDownEventHandler += (sender, e) => {
- RemoveFromParent();
- };
+ TopView view = new TopView();
+ this.AddChidren(view.TopRowView());
+ view.toptitleNameBtn.TextID = MyInternationalizationString.securitymode;
+ view.clickBtn.MouseDownEventHandler += (sender, e) => { RemoveFromParent(); };
#endregion
var middle = new FrameLayout();
- middle.Y = topRowLayout.Bottom;
+ middle.Y = view.topRowLayout.Bottom;
middle.Height = Application.GetRealHeight(1920 - 184);
middle.BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor;
this.AddChidren(middle);
@@ -86,16 +44,13 @@
BackgroundColor = ZigbeeColor.Current.LogicBtnSaveBackgroundColor,
TextID = MyInternationalizationString.Save,
TextColor = ZigbeeColor.Current.LogicBtnSaveTextColor,
+ TextSize=16,
};
middle.AddChidren(btnsave);
-
-
-
#region ----(鍦ㄥ/绂诲)甯冮槻 鎾ら槻 鑳佽揩鎾ら槻----
#region 鍦ㄥ甯冮槻
-
var athomeFrameLayout = new FrameLayout
{
@@ -106,8 +61,8 @@
var athomeiconBtn = new Button
{
- Width = Application.GetRealWidth(81),
- Height = Application.GetRealHeight(81),
+ Width = Application.GetMinRealAverage(81),
+ Height = Application.GetMinRealAverage(81),
X = Application.GetRealWidth(58),
Y = Application.GetRealHeight(55),
UnSelectedImagePath = "ZigeeLogic/athome.png",
@@ -130,6 +85,8 @@
Text = Language.StringByID(MyInternationalizationString.logicathomegarrison),
TextAlignment = TextAlignment.CenterLeft,
TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+ TextSize = 15,
+
};
athomedefenceRowLayout.AddChidren(btnathomedefence);
var athomedefenceSelected = new SelectedButton(789);
@@ -149,8 +106,8 @@
var leavehomeiconBtn = new Button
{
- Width = Application.GetRealWidth(81),
- Height = Application.GetRealHeight(81),
+ Width = Application.GetMinRealAverage(81),
+ Height = Application.GetMinRealAverage(81),
X = Application.GetRealWidth(58),
Y = Application.GetRealHeight(55),
UnSelectedImagePath = "ZigeeLogic/leavehome.png",
@@ -174,6 +131,7 @@
Text = Language.StringByID(MyInternationalizationString.logicremovehomegarrison),
TextAlignment = TextAlignment.CenterLeft,
TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+ TextSize = 15,
};
leavehomedefenceRowLayout.AddChidren(leavehomebtndefence);
@@ -196,8 +154,8 @@
var withdrawaliconBtn = new Button
{
- Width = Application.GetRealWidth(81),
- Height = Application.GetRealHeight(81),
+ Width = Application.GetMinRealAverage(81),
+ Height = Application.GetMinRealAverage(81),
X = Application.GetRealWidth(58),
Y = Application.GetRealHeight(55),
UnSelectedImagePath = "ZigeeLogic/withdrawal.png",
@@ -223,6 +181,7 @@
TextAlignment = TextAlignment.CenterLeft,
TextColor = ZigbeeColor.Current.LogicTextBlackColor,
TextID = MyInternationalizationString.withdrawal,
+ TextSize = 15,
};
withdrawalRowLayout.AddChidren(btnwithdrawal);
@@ -243,8 +202,8 @@
var urgentwithdiconBtn = new Button
{
- Width = Application.GetRealWidth(81),
- Height = Application.GetRealHeight(81),
+ Width = Application.GetMinRealAverage(81),
+ Height = Application.GetMinRealAverage(81),
X = Application.GetRealWidth(58),
Y = Application.GetRealHeight(55),
UnSelectedImagePath = "ZigeeLogic/withdrawal.png",
@@ -267,6 +226,7 @@
TextID = MyInternationalizationString.urgentwithdrawal,
TextAlignment = TextAlignment.CenterLeft,
TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+ TextSize = 15,
};
urgentwithdrawalRowLayout.AddChidren(btnurgentwithdrawal);
@@ -360,18 +320,22 @@
}
else if (actions["SecuritySetting"].ToString() == "1")
{
- athomedefenceSelected.Visible = true;
- leavehomedefenceSelected.Visible = false;
- withdrawalSelected.Visible = false;
- urgentwithdrawalSelected.Visible = false;
- }
- else if (actions["SecuritySetting"].ToString() == "2")
- {
- athomedefenceSelected.Visible = false;
- leavehomedefenceSelected.Visible = true;
- withdrawalSelected.Visible = false;
- urgentwithdrawalSelected.Visible = false;
+ if (actions["SecurityModeId"].ToString() == "1")
+ {
+ athomedefenceSelected.Visible = true;
+ leavehomedefenceSelected.Visible = false;
+ withdrawalSelected.Visible = false;
+ urgentwithdrawalSelected.Visible = false;
+ }
+ else
+ {
+ athomedefenceSelected.Visible = false;
+ leavehomedefenceSelected.Visible = true;
+ withdrawalSelected.Visible = false;
+ urgentwithdrawalSelected.Visible = false;
+
+ }
}
break;
@@ -386,6 +350,11 @@
{
if (!athomedefenceSelected.Visible && !leavehomedefenceSelected.Visible && !withdrawalSelected.Visible && !urgentwithdrawalSelected.Visible)
{
+
+ var alert = new UserCenter.ShowMsgControl(UserCenter.ShowMsgType.Normal,
+ Language.StringByID(MyInternationalizationString.securitytip),
+ Language.StringByID(MyInternationalizationString.confrim));
+ alert.Show();
return;
}
--
Gitblit v1.8.0