From da3634e011bbda29cf4e1c168997b780fe795b20 Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期三, 13 五月 2020 09:05:23 +0800
Subject: [PATCH] 优化新风模块和新风面板的测试功能，请合并代码
---
ZigbeeApp/Shared/Phone/MainPage/ControlForm/DeviceFreshAirDetailCardForm.cs | 139 +++++++++++++++++++++++++++++++++++-----------
1 files changed, 105 insertions(+), 34 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/MainPage/ControlForm/DeviceFreshAirDetailCardForm.cs b/ZigbeeApp/Shared/Phone/MainPage/ControlForm/DeviceFreshAirDetailCardForm.cs
index d2cb6cd..914d62e 100644
--- a/ZigbeeApp/Shared/Phone/MainPage/ControlForm/DeviceFreshAirDetailCardForm.cs
+++ b/ZigbeeApp/Shared/Phone/MainPage/ControlForm/DeviceFreshAirDetailCardForm.cs
@@ -19,7 +19,7 @@
/// <summary>
/// 鎺т欢
/// </summary>
- private FreshAir FreshAirDev = null;
+ private FreshAir freshAirDev = null;
/// <summary>
/// 鐘舵�佹帶浠�
/// </summary>
@@ -32,17 +32,16 @@
/// <summary>
/// 璁惧鍚嶇О鎺т欢
/// </summary>
- private NormalViewControl btnDeviceName = null;
-
+ private NormalViewControl btnDeviceName = null;
+
#endregion
#region 鈻� 鍒濆鍖朹____________________________
public override void InitMiddleFrameAfter(FrameLayout frameWhiteBack)
{
-
//宸︽粦涓嶈兘
this.ScrollEnabled = true;
- this.FreshAirDev = (FreshAir)this.device;
+ this.freshAirDev = (FreshAir)this.device;
//鍏堟竻绌�
this.listControl = new List<ButtonBase>();
InitFreshAirControl(frameWhiteBack);
@@ -64,6 +63,13 @@
frameAcBack.BackgroundImagePath = "FreshAir/FreshAirPic.png";
frameWhiteBack.AddChidren(frameAcBack);
+ //鏂伴鑷姩Layout銆愪负浜嗘墿澶х偣鍑昏寖鍥淬��
+ 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;
+
// 鑷姩锛堢1涓紝listControl銆�0銆戯級
var btnAuto = new NormalViewControl(213, 63, true);
btnAuto.X = Application.GetRealWidth(275);
@@ -73,14 +79,9 @@
btnAuto.IsBold = false;
btnAuto.TextAlignment = TextAlignment.Center;
frameWhiteBack.AddChidren(btnAuto);
+
this.listControl.Add(btnAuto);
- btnAuto.ButtonClickEvent += (sender, e) =>
- {
- if (!btnAuto.IsSelected)
- {
- this.SetFanComand(5);
- }
- };
+ btnAuto.ButtonClickEvent += HandlerAuto;
//鑷姩涓嬪垝绾匡紙绗�2涓紝listControl銆�1銆戯級
var btnAutoLine = new NormalViewControl(72, 12, true);
@@ -90,6 +91,14 @@
btnAutoLine.Visible = false;
frameWhiteBack.AddChidren(btnAutoLine);
this.listControl.Add(btnAutoLine);
+ btnAutoLine.ButtonClickEvent += HandlerAuto;
+
+ //鏂伴鎵嬪姩Layout銆愪负浜嗘墿澶х偣鍑昏寖鍥淬��
+ 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;
//鎵嬪姩锛堢3涓紝listControl銆�2銆戯級
var btnManual = new NormalViewControl(213, 63, true);
@@ -101,13 +110,7 @@
btnManual.TextAlignment = TextAlignment.Center;
frameWhiteBack.AddChidren(btnManual);
this.listControl.Add(btnManual);
- btnManual.ButtonClickEvent += (sender, e) =>
- {
- if (!btnManual.IsSelected)
- {
- this.SetFanComand(15);
- }
- };
+ btnManual.ButtonClickEvent += HandlerManual;
//鎵嬪姩涓嬪垝绾匡紙绗�4涓紝listControl銆�3銆戯級
var btnManualLine = new NormalViewControl(72, 12, true);
@@ -117,6 +120,7 @@
btnManualLine.Visible = false;
frameWhiteBack.AddChidren(btnManualLine);
this.listControl.Add(btnManualLine);
+ btnManualLine.ButtonClickEvent += HandlerManual;
//楂橀锛堢5涓紝listControl銆�4銆戯級
var btnHighSpeed = new IconViewControl(81);
@@ -128,7 +132,11 @@
this.listControl.Add(btnHighSpeed);
btnHighSpeed.ButtonClickEvent += (sender, e) =>
{
- if (FreshAirDev.currentFanMode == 5)
+ if (freshAirDev.currentFanStatus == 0)
+ {
+ return;
+ }
+ if (freshAirDev.currentFanMode == 5)
{
var msgContr = new ShowMsgControl(ShowMsgType.Tip, Language.StringByID(R.MyInternationalizationString.AutoModeForbiddenOperate));
msgContr.Show();
@@ -137,6 +145,7 @@
if (!btnHighSpeed.IsSelected)
{
+ this.listControl[4].Enable = false;
this.SetFanComand(3);
}
};
@@ -154,10 +163,12 @@
btnSwitch.IsSelected = !btnSwitch.IsSelected;
if (btnSwitch.IsSelected)
{
+ this.listControl[5].Enable = false;
this.SetFanComand(4);
}
else
{
+ this.listControl[5].Enable = false;
this.SetFanComand(0);
}
};
@@ -172,7 +183,11 @@
this.listControl.Add(btnLowSpeed);
btnLowSpeed.ButtonClickEvent += (sender, e) =>
{
- if (FreshAirDev.currentFanMode == 5)
+ if (freshAirDev.currentFanStatus == 0)
+ {
+ return;
+ }
+ if (freshAirDev.currentFanMode == 5)
{
var msgContr = new ShowMsgControl(ShowMsgType.Tip, Language.StringByID(R.MyInternationalizationString.AutoModeForbiddenOperate));
msgContr.Show();
@@ -180,9 +195,54 @@
}
if (!btnLowSpeed.IsSelected)
{
+ this.listControl[6].Enable = false;
this.SetFanComand(1);
}
};
+ }
+
+ /// <summary>
+ /// 鑷姩浜嬩欢
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void HandlerAuto(object sender, MouseEventArgs e)
+ {
+ if (freshAirDev.currentFanStatus == 0)
+ {
+ return;
+ }
+ if (freshAirDev.currentFanMode == 5)
+ {
+ return;
+ }
+ if (!listControl[0].IsSelected)
+ {
+ this.listControl[0].Enable = false;
+ this.SetFanComand(5);
+ }
+ }
+
+ /// <summary>
+ /// 鎵嬪姩浜嬩欢
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void HandlerManual(object sender, MouseEventArgs e)
+ {
+ if (freshAirDev.currentFanStatus == 0)
+ {
+ return;
+ }
+ if (freshAirDev.currentFanMode == 15)
+ {
+ return;
+ }
+ if (!this.listControl[2].IsSelected)
+ {
+ this.listControl[2].Enable = false;
+ this.SetFanComand(15);
+ }
}
#endregion
@@ -217,6 +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;
return false;
}
#endregion
@@ -245,22 +310,22 @@
switch (command)
{
case 0:
- FreshAirDev.Close();
+ freshAirDev.Close();
break;
case 1:
- FreshAirDev.SetLowSpeed();
+ freshAirDev.SetLowSpeed();
break;
case 3:
- FreshAirDev.SetHighSpeed();
+ freshAirDev.SetHighSpeed();
break;
case 4:
- FreshAirDev.Open();
+ freshAirDev.Open();
break;
case 5:
- FreshAirDev.SetAuto();
+ freshAirDev.SetAuto();
break;
case 15:
- FreshAirDev.SetManual();
+ freshAirDev.SetManual();
break;
}
}
@@ -273,14 +338,15 @@
private void UpdateStatus()
{
//璁剧疆鐘舵�佹枃瀛�
- if (FreshAirDev.currentFanStatus == 4)
+ if (freshAirDev.currentFanStatus == 4)
{
+ this.listControl[5].Enable = true;
//鎵撳紑
this.listControl[5].IsSelected = true;
//璁剧疆鐘舵�佹枃瀛�
this.SetStatuText(Language.StringByID(R.MyInternationalizationString.uOpen1));
}
- if (FreshAirDev.currentFanStatus == 0)
+ if (freshAirDev.currentFanStatus == 0)
{
//鍏抽棴
this.listControl[0].TextColor = ZigbeeColor.Current.XMGray3;
@@ -291,14 +357,15 @@
this.listControl[3].Visible = false;
this.listControl[4].IsSelected = false;
this.listControl[5].IsSelected = false;
- this.listControl[6].IsSelected = false;
+ this.listControl[6].IsSelected = false;
+ this.listControl[5].Enable = true;
//璁剧疆鐘舵�佹枃瀛�
this.SetStatuText(Language.StringByID(R.MyInternationalizationString.Close));
return;
}
//璁剧疆妯″紡
- if (FreshAirDev.currentFanMode == 5)
+ if (freshAirDev.currentFanMode == 5)
{
this.listControl[0].TextColor = ZigbeeColor.Current.XMGray1;
this.listControl[0].IsBold = true;
@@ -306,8 +373,9 @@
this.listControl[2].TextColor = ZigbeeColor.Current.XMGray3;
this.listControl[2].IsBold = false;
this.listControl[3].Visible = false;
+ this.listControl[0].Enable = true;
}
- else if (FreshAirDev.currentFanMode == 15)
+ else if (freshAirDev.currentFanMode == 15)
{
this.listControl[0].TextColor = ZigbeeColor.Current.XMGray3;
this.listControl[0].IsBold = false;
@@ -315,18 +383,21 @@
this.listControl[2].TextColor = ZigbeeColor.Current.XMGray1;
this.listControl[2].IsBold = true;
this.listControl[3].Visible = true;
+ this.listControl[2].Enable = true;
}
//璁剧疆椋庨��
- if (FreshAirDev.currentFanSpeed == 1)
+ if (freshAirDev.currentFanSpeed == 1)
{
this.listControl[4].IsSelected = false;
this.listControl[6].IsSelected = true;
+ this.listControl[6].Enable = true;
}
- else if (FreshAirDev.currentFanSpeed == 3)
+ else if (freshAirDev.currentFanSpeed == 3)
{
this.listControl[4].IsSelected = true;
this.listControl[6].IsSelected = false;
+ this.listControl[4].Enable = true;
}
}
#endregion
--
Gitblit v1.8.0