From 9a4629512ccf8359efd88671c9317c3cc7faf0c8 Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期一, 29 八月 2022 16:46:40 +0800
Subject: [PATCH] Merge branch 'dev' into dev-temp
---
ZigbeeApp/Shared/Phone/Device/Logic/SecurityMode.cs | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/SecurityMode.cs b/ZigbeeApp/Shared/Phone/Device/Logic/SecurityMode.cs
index b104933..c3184dd 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/SecurityMode.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/SecurityMode.cs
@@ -47,8 +47,8 @@
FunView athomeView = new FunView();
athomeView.iconBtn.UnSelectedImagePath = "ZigeeLogic/athome.png";
athomeView.funnameBtn.TextID = MyInternationalizationString.logicathomegarrison;
- athomeView.funnextBtn.Width = Application.GetMinRealAverage(60);
- athomeView.funnextBtn.Height = Application.GetMinRealAverage(60);
+ athomeView.funnextBtn.Width = Application.GetRealWidth(60);
+ athomeView.funnextBtn.Height = Application.GetRealWidth(60);
athomeView.funnextBtn.UnSelectedImagePath = "ZigeeLogic/selected.png";
athomeView.funnextBtn.Visible = false;
middle.AddChidren(athomeView.FunFrameView());
@@ -79,8 +79,8 @@
withdrawalView.funFrameLayout.Y = leaveView.funFrameLayout.Bottom;
withdrawalView.iconBtn.UnSelectedImagePath = "ZigeeLogic/withdrawal.png";
withdrawalView.funnameBtn.TextID = MyInternationalizationString.withdrawal;
- withdrawalView.funnextBtn.Width = Application.GetMinRealAverage(60);
- withdrawalView.funnextBtn.Height = Application.GetMinRealAverage(60);
+ withdrawalView.funnextBtn.Width = Application.GetRealWidth(60);
+ withdrawalView.funnextBtn.Height = Application.GetRealWidth(60);
withdrawalView.funnextBtn.UnSelectedImagePath = "ZigeeLogic/selected.png";
withdrawalView.funnextBtn.Visible = false;
middle.AddChidren(withdrawalView.FunFrameView());
@@ -95,8 +95,8 @@
urgentwithdView.lineBtn.BackgroundColor = ZigbeeColor.Current.LogicBlankBackgroundColor; ///鏀瑰彉鏈�鍚庡姛鑳藉揩绾挎潯棰滆壊
urgentwithdView.iconBtn.UnSelectedImagePath = "ZigeeLogic/withdrawal.png";
urgentwithdView.funnameBtn.TextID = MyInternationalizationString.urgentwithdrawal;
- urgentwithdView.funnextBtn.Width = Application.GetMinRealAverage(60);
- urgentwithdView.funnextBtn.Height = Application.GetMinRealAverage(60);
+ urgentwithdView.funnextBtn.Width = Application.GetRealWidth(60);
+ urgentwithdView.funnextBtn.Height = Application.GetRealWidth(60);
urgentwithdView.funnextBtn.UnSelectedImagePath = "ZigeeLogic/selected.png";
urgentwithdView.funnextBtn.Visible = false;
middle.AddChidren(urgentwithdView.FunFrameView());
@@ -202,7 +202,7 @@
if (!athomeView.funnextBtn.Visible && !leaveView.funnextBtn.Visible && !withdrawalView.funnextBtn.Visible && !urgentwithdView.funnextBtn.Visible)
{
- var alert = new ShowMsgControl(ShowMsgType.Normal,
+ var alert = new UserCenter.ShowMsgControl(ShowMsgType.Normal,
Language.StringByID(MyInternationalizationString.securitytip),
Language.StringByID(MyInternationalizationString.confrim));
alert.Show();
--
Gitblit v1.8.0