From 99da2604f81af29afc6b3c6f4f128b4e5a8a5649 Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期三, 13 五月 2020 12:00:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-tzy' into dev-2020xm
---
ZigbeeApp/Shared/Phone/MainPage/ControlForm/DeviceFreshAirDetailCardForm.cs | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/MainPage/ControlForm/DeviceFreshAirDetailCardForm.cs b/ZigbeeApp/Shared/Phone/MainPage/ControlForm/DeviceFreshAirDetailCardForm.cs
index 914d62e..b947b03 100644
--- a/ZigbeeApp/Shared/Phone/MainPage/ControlForm/DeviceFreshAirDetailCardForm.cs
+++ b/ZigbeeApp/Shared/Phone/MainPage/ControlForm/DeviceFreshAirDetailCardForm.cs
@@ -11,7 +11,7 @@
/// </summary>
public class DeviceFreshAirDetailCardForm : DeviceDetailCardCommonForm
{
- #region 鈻� 鍙橀噺澹版槑___________________________
+ #region 鈻� 鍙橀噺澹版槑___________________________
/// <summary>
/// 鐣岄潰涓婂彲浠ユ搷浣滅殑鎺т欢
/// </summary>
@@ -244,7 +244,7 @@
this.SetFanComand(15);
}
}
- #endregion
+ #endregion
#region 鈻� 鏄惁鑾峰彇缃戝叧鍙嶉鐨勭粨鏋淿____________
@@ -286,7 +286,7 @@
}
#endregion
- #region 鈻� 璁剧疆鏂规硶
+ #region 鈻� 璁剧疆鏂规硶
/// <summary>
///鍛戒护
///0:Off
@@ -295,7 +295,7 @@
///4:On
///5:Auto
/// 15:Manual
- /// </summary>
+ /// </summary>
private void SetFanComand(int command)
{
//妫�娴嬫槸鍚﹁幏鍙栫綉鍏冲弽棣堢殑缁撴灉,濡傛灉缃戝叧娌℃湁鍥炲,鍒欎細寮瑰嚭娑堟伅
@@ -343,7 +343,7 @@
this.listControl[5].Enable = true;
//鎵撳紑
this.listControl[5].IsSelected = true;
- //璁剧疆鐘舵�佹枃瀛�
+ //璁剧疆鐘舵�佹枃瀛�
this.SetStatuText(Language.StringByID(R.MyInternationalizationString.uOpen1));
}
if (freshAirDev.currentFanStatus == 0)
@@ -359,7 +359,7 @@
this.listControl[5].IsSelected = false;
this.listControl[6].IsSelected = false;
this.listControl[5].Enable = true;
- //璁剧疆鐘舵�佹枃瀛�
+ //璁剧疆鐘舵�佹枃瀛�
this.SetStatuText(Language.StringByID(R.MyInternationalizationString.Close));
return;
}
--
Gitblit v1.8.0