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/WeekPage.cs | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/WeekPage.cs b/ZigbeeApp/Shared/Phone/Device/Logic/WeekPage.cs
index 00600f3..db4cf4f 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/WeekPage.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/WeekPage.cs
@@ -97,8 +97,8 @@
FunView monView = new FunView();
monView.iconBtn.UnSelectedImagePath = "ZigeeLogic/point.png";
monView.funnameBtn.Text= name;
- monView.funnextBtn.Width = Application.GetMinRealAverage(60);
- monView.funnextBtn.Height = Application.GetMinRealAverage(60);
+ monView.funnextBtn.Width = Application.GetRealWidth(60);
+ monView.funnextBtn.Height = Application.GetRealWidth(60);
monView.funnextBtn.UnSelectedImagePath = "ZigeeLogic/selected.png";
monView.funnextBtn.Visible = false;
middle.AddChidren(monView.FunFrameView());
@@ -172,7 +172,7 @@
}
if (weekvalue == 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