From 3291885285dfd5d4f665c20676307878dc3163bc Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期五, 20 十二月 2019 16:28:53 +0800
Subject: [PATCH] 请合并最新代码（优化设备不支持的功能）
---
ZigbeeApp/Shared/Phone/Device/Logic/SecurityMode.cs | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/SecurityMode.cs b/ZigbeeApp/Shared/Phone/Device/Logic/SecurityMode.cs
index 395bc71..9c96d7a 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/SecurityMode.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/SecurityMode.cs
@@ -32,14 +32,15 @@
var titleName = new Button
{
- TextSize = 16,
+ TextSize = 17,
TextColor = ZigbeeColor.Current.LogicTextBlackColor,
TextAlignment = TextAlignment.CenterLeft,
X = Application.GetRealWidth(176),
- Width = Application.GetRealWidth(400),
+ Width = Application.GetRealWidth(600),
Height = Application.GetRealHeight(69),
Y = Application.GetRealHeight(92),
TextID = MyInternationalizationString.securitymode,
+ IsBold = true,
};
topRowLayout.AddChidren(titleName);
@@ -130,6 +131,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 +177,7 @@
Text = Language.StringByID(MyInternationalizationString.logicremovehomegarrison),
TextAlignment = TextAlignment.CenterLeft,
TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+ TextSize = 15,
};
leavehomedefenceRowLayout.AddChidren(leavehomebtndefence);
@@ -223,6 +227,7 @@
TextAlignment = TextAlignment.CenterLeft,
TextColor = ZigbeeColor.Current.LogicTextBlackColor,
TextID = MyInternationalizationString.withdrawal,
+ TextSize = 15,
};
withdrawalRowLayout.AddChidren(btnwithdrawal);
@@ -267,6 +272,7 @@
TextID = MyInternationalizationString.urgentwithdrawal,
TextAlignment = TextAlignment.CenterLeft,
TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+ TextSize = 15,
};
urgentwithdrawalRowLayout.AddChidren(btnurgentwithdrawal);
@@ -386,6 +392,10 @@
{
if (!athomedefenceSelected.Visible && !leavehomedefenceSelected.Visible && !withdrawalSelected.Visible && !urgentwithdrawalSelected.Visible)
{
+ var alert = new Alert(Language.StringByID(MyInternationalizationString.Prompt),
+ Language.StringByID(MyInternationalizationString.securitytip),
+ Language.StringByID(MyInternationalizationString.confrim));
+ alert.Show();
return;
}
--
Gitblit v1.8.0