From 9a4b76398009cf76c508d61f7e48fb6f5cb7ac2d Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期二, 21 七月 2020 09:46:53 +0800
Subject: [PATCH] 请合并最新多功能面板代码
---
ZigbeeApp/Shared/Phone/MainPage/ControlForm/DeviceFreshAirDetailCardForm.cs | 34 +++++++++++++++++-----------------
1 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/MainPage/ControlForm/DeviceFreshAirDetailCardForm.cs b/ZigbeeApp/Shared/Phone/MainPage/ControlForm/DeviceFreshAirDetailCardForm.cs
old mode 100644
new mode 100755
index 914d62e..8c05c1f
--- a/ZigbeeApp/Shared/Phone/MainPage/ControlForm/DeviceFreshAirDetailCardForm.cs
+++ b/ZigbeeApp/Shared/Phone/MainPage/ControlForm/DeviceFreshAirDetailCardForm.cs
@@ -64,8 +64,8 @@
frameWhiteBack.AddChidren(frameAcBack);
//鏂伴鑷姩Layout銆愪负浜嗘墿澶х偣鍑昏寖鍥淬��
- var autoFrameLayout = new NormalViewControl(213 + 40, 63 + 80, true);
- autoFrameLayout.X = Application.GetRealWidth(275 - 20);
+ var autoFrameLayout = new NormalViewControl(213 + 40, 63 + 80, true);
+ autoFrameLayout.X = Application.GetRealWidth(275 - 20);
autoFrameLayout.Y = Application.GetRealHeight(821 - 20);
frameWhiteBack.AddChidren(autoFrameLayout);
autoFrameLayout.ButtonClickEvent += HandlerAuto;
@@ -79,9 +79,9 @@
btnAuto.IsBold = false;
btnAuto.TextAlignment = TextAlignment.Center;
frameWhiteBack.AddChidren(btnAuto);
-
+
this.listControl.Add(btnAuto);
- btnAuto.ButtonClickEvent += HandlerAuto;
+ btnAuto.ButtonClickEvent += HandlerAuto;
//鑷姩涓嬪垝绾匡紙绗�2涓紝listControl銆�1銆戯級
var btnAutoLine = new NormalViewControl(72, 12, true);
@@ -94,8 +94,8 @@
btnAutoLine.ButtonClickEvent += HandlerAuto;
//鏂伴鎵嬪姩Layout銆愪负浜嗘墿澶х偣鍑昏寖鍥淬��
- var manualFrameLayout = new NormalViewControl(213 + 40, 63 + 80, true);
- manualFrameLayout.X = Application.GetRealWidth(488 - 20);
+ var manualFrameLayout = new NormalViewControl(213 + 40, 63 + 80, true);
+ manualFrameLayout.X = Application.GetRealWidth(488 - 20);
manualFrameLayout.Y = Application.GetRealHeight(821 - 20);
frameWhiteBack.AddChidren(manualFrameLayout);
manualFrameLayout.ButtonClickEvent += HandlerManual;
@@ -110,7 +110,7 @@
btnManual.TextAlignment = TextAlignment.Center;
frameWhiteBack.AddChidren(btnManual);
this.listControl.Add(btnManual);
- btnManual.ButtonClickEvent += HandlerManual;
+ btnManual.ButtonClickEvent += HandlerManual;
//鎵嬪姩涓嬪垝绾匡紙绗�4涓紝listControl銆�3銆戯級
var btnManualLine = new NormalViewControl(72, 12, true);
@@ -135,7 +135,7 @@
if (freshAirDev.currentFanStatus == 0)
{
return;
- }
+ }
if (freshAirDev.currentFanMode == 5)
{
var msgContr = new ShowMsgControl(ShowMsgType.Tip, Language.StringByID(R.MyInternationalizationString.AutoModeForbiddenOperate));
@@ -206,7 +206,7 @@
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
- private void HandlerAuto(object sender, MouseEventArgs e)
+ private void HandlerAuto(object sender, MouseEventArgs e)
{
if (freshAirDev.currentFanStatus == 0)
{
@@ -228,7 +228,7 @@
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
- private void HandlerManual(object sender, MouseEventArgs e)
+ private void HandlerManual(object sender, MouseEventArgs e)
{
if (freshAirDev.currentFanStatus == 0)
{
@@ -277,11 +277,11 @@
}
}
}
- this.listControl[0].Enable = true;
- this.listControl[2].Enable = true;
- this.listControl[4].Enable = true;
- this.listControl[5].Enable = true;
- this.listControl[6].Enable = true;
+ this.listControl[0].Enable = true;
+ this.listControl[2].Enable = true;
+ this.listControl[4].Enable = true;
+ this.listControl[5].Enable = true;
+ this.listControl[6].Enable = true;
return false;
}
#endregion
@@ -357,8 +357,8 @@
this.listControl[3].Visible = false;
this.listControl[4].IsSelected = false;
this.listControl[5].IsSelected = false;
- this.listControl[6].IsSelected = false;
- this.listControl[5].Enable = true;
+ this.listControl[6].IsSelected = false;
+ this.listControl[5].Enable = true;
//璁剧疆鐘舵�佹枃瀛�
this.SetStatuText(Language.StringByID(R.MyInternationalizationString.Close));
return;
--
Gitblit v1.8.0