From 66a9965c44ecc32a6696abca876ab9d1cd091584 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期五, 28 二月 2020 15:25:13 +0800
Subject: [PATCH] 2020.2.28
---
ZigbeeApp/Shared/Phone/Device/Logic/SecurityMode.cs | 30 +++++++++++++++++++++---------
1 files changed, 21 insertions(+), 9 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/SecurityMode.cs b/ZigbeeApp/Shared/Phone/Device/Logic/SecurityMode.cs
index 7e9a54c..66b7f3d 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/SecurityMode.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/SecurityMode.cs
@@ -32,7 +32,7 @@
var titleName = new Button
{
- TextSize = 16,
+ TextSize = 17,
TextColor = ZigbeeColor.Current.LogicTextBlackColor,
TextAlignment = TextAlignment.CenterLeft,
X = Application.GetRealWidth(176),
@@ -40,6 +40,7 @@
Height = Application.GetRealHeight(69),
Y = Application.GetRealHeight(92),
TextID = MyInternationalizationString.securitymode,
+ IsBold = true,
};
topRowLayout.AddChidren(titleName);
@@ -86,6 +87,7 @@
BackgroundColor = ZigbeeColor.Current.LogicBtnSaveBackgroundColor,
TextID = MyInternationalizationString.Save,
TextColor = ZigbeeColor.Current.LogicBtnSaveTextColor,
+ TextSize=16,
};
middle.AddChidren(btnsave);
@@ -130,6 +132,8 @@
Text = Language.StringByID(MyInternationalizationString.logicathomegarrison),
TextAlignment = TextAlignment.CenterLeft,
TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+ TextSize = 15,
+
};
athomedefenceRowLayout.AddChidren(btnathomedefence);
var athomedefenceSelected = new SelectedButton(789);
@@ -174,6 +178,7 @@
Text = Language.StringByID(MyInternationalizationString.logicremovehomegarrison),
TextAlignment = TextAlignment.CenterLeft,
TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+ TextSize = 15,
};
leavehomedefenceRowLayout.AddChidren(leavehomebtndefence);
@@ -223,6 +228,7 @@
TextAlignment = TextAlignment.CenterLeft,
TextColor = ZigbeeColor.Current.LogicTextBlackColor,
TextID = MyInternationalizationString.withdrawal,
+ TextSize = 15,
};
withdrawalRowLayout.AddChidren(btnwithdrawal);
@@ -267,6 +273,7 @@
TextID = MyInternationalizationString.urgentwithdrawal,
TextAlignment = TextAlignment.CenterLeft,
TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+ TextSize = 15,
};
urgentwithdrawalRowLayout.AddChidren(btnurgentwithdrawal);
@@ -360,18 +367,18 @@
}
else if (actions["SecuritySetting"].ToString() == "1")
{
+ if (actions["SecurityModeId"].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;
-
+ }
+ else {
+ athomedefenceSelected.Visible = false;
+ leavehomedefenceSelected.Visible = true;
+ withdrawalSelected.Visible = false;
+ urgentwithdrawalSelected.Visible = false;
+ }
}
break;
@@ -386,6 +393,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