From 6bca8fcd37a48808a0b9c9342fc1be0adddfece6 Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期五, 08 五月 2020 17:46:44 +0800
Subject: [PATCH] 请合并最新代码，优化绑定信息
---
ZigbeeApp/Shared/Phone/MainPage/ControlForm/DeviceFreshAirDetailCardForm.cs | 26 +++++++++++++++++++-------
1 files changed, 19 insertions(+), 7 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/MainPage/ControlForm/DeviceFreshAirDetailCardForm.cs b/ZigbeeApp/Shared/Phone/MainPage/ControlForm/DeviceFreshAirDetailCardForm.cs
index 32925fc..91574a2 100644
--- a/ZigbeeApp/Shared/Phone/MainPage/ControlForm/DeviceFreshAirDetailCardForm.cs
+++ b/ZigbeeApp/Shared/Phone/MainPage/ControlForm/DeviceFreshAirDetailCardForm.cs
@@ -32,10 +32,9 @@
/// <summary>
/// 璁惧鍚嶇О鎺т欢
/// </summary>
- private NormalViewControl btnDeviceName = null;
-
- #endregion
+ private NormalViewControl btnDeviceName = null;
+ #endregion
#region 鈻� 鍒濆鍖朹____________________________
public override void InitMiddleFrameAfter(FrameLayout frameWhiteBack)
@@ -106,7 +105,7 @@
{
if (!btnManual.IsSelected)
{
- this.SetFanComand(7);
+ this.SetFanComand(15);
}
};
@@ -129,6 +128,13 @@
this.listControl.Add(btnHighSpeed);
btnHighSpeed.ButtonClickEvent += (sender, e) =>
{
+ if (FreshAirDev.currentFanMode == 15)
+ {
+ var msgContr = new ShowMsgControl(ShowMsgType.Tip, Language.StringByID(R.MyInternationalizationString.AutoModeForbiddenOperate));
+ msgContr.Show();
+ return;
+ }
+
if (!btnHighSpeed.IsSelected)
{
this.SetFanComand(3);
@@ -166,6 +172,12 @@
this.listControl.Add(btnLowSpeed);
btnLowSpeed.ButtonClickEvent += (sender, e) =>
{
+ if (FreshAirDev.currentFanMode == 15)
+ {
+ var msgContr = new ShowMsgControl(ShowMsgType.Tip, Language.StringByID(R.MyInternationalizationString.AutoModeForbiddenOperate));
+ msgContr.Show();
+ return;
+ }
if (!btnLowSpeed.IsSelected)
{
this.SetFanComand(1);
@@ -217,7 +229,7 @@
///3:High
///4:On
///5:Auto
- /// 7:Manual
+ /// 15:Manual
/// </summary>
private void SetFanComand(int command)
{
@@ -247,7 +259,7 @@
case 5:
FreshAirDev.SetAuto();
break;
- case 7:
+ case 15:
FreshAirDev.SetManual();
break;
}
@@ -295,7 +307,7 @@
this.listControl[2].IsBold = false;
this.listControl[3].Visible = false;
}
- else if (FreshAirDev.currentFanMode == 7)
+ else if (FreshAirDev.currentFanMode == 15)
{
this.listControl[0].TextColor = ZigbeeColor.Current.XMGray3;
this.listControl[0].IsBold = false;
--
Gitblit v1.8.0