From fe3b2466c68b5db70d38e78039703add3b8b1dfe Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 31 十二月 2020 19:29:43 +0800
Subject: [PATCH] 合并了代码
---
ZigbeeApp/Shared/Phone/Device/Logic/EverymonthPage.cs | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/EverymonthPage.cs b/ZigbeeApp/Shared/Phone/Device/Logic/EverymonthPage.cs
index 74b1fd1..0124d81 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/EverymonthPage.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/EverymonthPage.cs
@@ -110,12 +110,12 @@
Text = k.ToString().Length == 1 ? "0" + k.ToString() : k.ToString(),
Y = Application.GetRealHeight(40),
- Height = Application.GetMinRealAverage(100),
- Width = Application.GetMinRealAverage(100),
+ Height = Application.GetRealWidth(100),
+ Width = Application.GetRealWidth(100),
X = Application.GetRealWidth(35 * j) + Application.GetRealWidth(100 * (j - 1)),
TextColor = ZigbeeColor.Current.LogicTextBlackColor,
SelectedTextColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
- Radius = (uint)Application.GetMinRealAverage(50),
+ Radius = (uint)Application.GetRealWidth(50),
BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
SelectedBackgroundColor = ZigbeeColor.Current.LogicAddColor,
Tag = k,
@@ -162,7 +162,7 @@
if (monselectedlist.Count == 0)
{
- var alert = new ShowMsgControl(ShowMsgType.Normal,
+ var alert = new UserCenter.ShowMsgControl(ShowMsgType.Normal,
Language.StringByID(MyInternationalizationString.selectweek),
Language.StringByID(MyInternationalizationString.confrim));
alert.Show();
--
Gitblit v1.8.0