From c1de48884fa145a16a0f8bcee93274dcfaa0ff82 Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期四, 07 五月 2020 10:40:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-tzy' into dev-2020xm
---
ZigbeeApp/Shared/Phone/ZigBee/Device/FreshAir.cs | 102 +++++++++++++++++++++++++-------------------------
1 files changed, 51 insertions(+), 51 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/ZigBee/Device/FreshAir.cs b/ZigbeeApp/Shared/Phone/ZigBee/Device/FreshAir.cs
index b7661a2..b90f787 100644
--- a/ZigbeeApp/Shared/Phone/ZigBee/Device/FreshAir.cs
+++ b/ZigbeeApp/Shared/Phone/ZigBee/Device/FreshAir.cs
@@ -18,7 +18,7 @@
/// 椋庨�熸ā寮�
/// <para>5:鑷姩</para>
/// <para>6:Smart</para>
- /// <para>7:鎵嬪姩</para>
+ /// <para>15:鎵嬪姩</para>
/// </summary>
public int currentFanMode = 0;
/// <summary>
@@ -35,59 +35,59 @@
/// </summary>
public int currentFanStatus = 0;
- /// <summary>
- /// 鍏抽棴
- /// </summary>
- /// <returns>The close.</returns>
- public async System.Threading.Tasks.Task<SetWritableValueResponAllData> Close()
- {
- return await SetFanModeAsync(FanMode.Off);
- }
-
- /// <summary>
- /// 寮�鍚�
- /// </summary>
- /// <returns>The open.</returns>
- public async System.Threading.Tasks.Task<SetWritableValueResponAllData> Open()
- {
- return await SetFanModeAsync(FanMode.On);
+ /// <summary>
+ /// 鍏抽棴
+ /// </summary>
+ /// <returns>The close.</returns>
+ public async System.Threading.Tasks.Task<SetWritableValueResponAllData> Close()
+ {
+ return await SetFanModeAsync(FanMode.Off);
}
- /// <summary>
- /// 楂橀
- /// </summary>
- /// <returns>The close.</returns>
- public async System.Threading.Tasks.Task<SetWritableValueResponAllData> SetHighSpeed()
- {
- return await SetFanModeAsync(FanMode.High);
- }
-
- /// <summary>
- /// 浣庨
- /// </summary>
- /// <returns>The open.</returns>
- public async System.Threading.Tasks.Task<SetWritableValueResponAllData> SetLowSpeed()
- {
- return await SetFanModeAsync(FanMode.Low);
+ /// <summary>
+ /// 寮�鍚�
+ /// </summary>
+ /// <returns>The open.</returns>
+ public async System.Threading.Tasks.Task<SetWritableValueResponAllData> Open()
+ {
+ return await SetFanModeAsync(FanMode.On);
+ }
+
+ /// <summary>
+ /// 楂橀
+ /// </summary>
+ /// <returns>The close.</returns>
+ public async System.Threading.Tasks.Task<SetWritableValueResponAllData> SetHighSpeed()
+ {
+ return await SetFanModeAsync(FanMode.High);
+ }
+
+ /// <summary>
+ /// 浣庨
+ /// </summary>
+ /// <returns>The open.</returns>
+ public async System.Threading.Tasks.Task<SetWritableValueResponAllData> SetLowSpeed()
+ {
+ return await SetFanModeAsync(FanMode.Low);
}
- /// <summary>
- /// 鎵嬪姩
- /// </summary>
- /// <returns>The close.</returns>
- public async System.Threading.Tasks.Task<SetWritableValueResponAllData> SetManual()
- {
- return await SetFanModeAsync(FanMode.Manual);
- }
-
- /// <summary>
- /// 鑷姩
- /// </summary>
- /// <returns>The open.</returns>
- public async System.Threading.Tasks.Task<SetWritableValueResponAllData> SetAuto()
- {
- return await SetFanModeAsync(FanMode.Auto);
+ /// <summary>
+ /// 鎵嬪姩
+ /// </summary>
+ /// <returns>The close.</returns>
+ public async System.Threading.Tasks.Task<SetWritableValueResponAllData> SetManual()
+ {
+ return await SetFanModeAsync(FanMode.Manual);
+ }
+
+ /// <summary>
+ /// 鑷姩
+ /// </summary>
+ /// <returns>The open.</returns>
+ public async System.Threading.Tasks.Task<SetWritableValueResponAllData> SetAuto()
+ {
+ return await SetFanModeAsync(FanMode.Auto);
}
///<summary >
@@ -224,7 +224,7 @@
/// <summary>
/// 鎵嬪姩
/// </summary>
- Manual = 7,
- }
+ Manual = 15,
+ }
}
}
--
Gitblit v1.8.0