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/Cycle.cs | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/Cycle.cs b/ZigbeeApp/Shared/Phone/Device/Logic/Cycle.cs
index 4235535..9396089 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/Cycle.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/Cycle.cs
@@ -31,7 +31,7 @@
var titleName = new Button
{
- TextSize = 16,
+ TextSize = 17,
TextColor = ZigbeeColor.Current.LogicTextBlackColor,
TextAlignment = TextAlignment.CenterLeft,
X = Application.GetRealWidth(176),
@@ -39,6 +39,7 @@
Height = Application.GetRealHeight(69),
Y = Application.GetRealHeight(92),
TextID = MyInternationalizationString.cycle,
+ IsBold = true,
};
topRowLayout.AddChidren(titleName);
@@ -96,6 +97,7 @@
BackgroundColor = ZigbeeColor.Current.LogicBtnSaveBackgroundColor,
TextID = MyInternationalizationString.Save,
TextColor = ZigbeeColor.Current.LogicBtnSaveTextColor,
+ TextSize = 16,
};
middle.AddChidren(btnsave);
@@ -135,6 +137,7 @@
Text = Language.StringByID(MyInternationalizationString.executeonce),
TextAlignment = TextAlignment.CenterLeft,
TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+ TextSize = 15,
};
onceRow.AddChidren(onceTextBtn);
@@ -181,6 +184,7 @@
TextID = MyInternationalizationString.everyday,
TextAlignment = TextAlignment.CenterLeft,
TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+ TextSize = 15,
};
everydayRow.AddChidren(everydayTxetBtn);
@@ -225,6 +229,7 @@
TextAlignment = TextAlignment.CenterLeft,
TextID = MyInternationalizationString.weekly,
TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+ TextSize = 15,
};
weekRow.AddChidren(weekTextBtn);
@@ -274,6 +279,7 @@
TextAlignment = TextAlignment.CenterLeft,
TextID = MyInternationalizationString.monthly,
TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+ TextSize = 15,
};
monthlyRow.AddChidren(monthlyTextBtn);
@@ -323,6 +329,7 @@
TextAlignment = TextAlignment.CenterLeft,
TextID = MyInternationalizationString.everyyear,
TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+ TextSize = 15,
};
yearRow.AddChidren(yearTextBtn);
@@ -427,7 +434,7 @@
{
var alert = new Alert(Language.StringByID(MyInternationalizationString.Prompt),
Language.StringByID(MyInternationalizationString.selectweek),
- Language.StringByID(MyInternationalizationString.complete));
+ Language.StringByID(MyInternationalizationString.confrim));
alert.Show();
return;
--
Gitblit v1.8.0