From a4924de3136289d10cabbf2f61a228387d44ded7 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期四, 07 十一月 2019 13:48:36 +0800
Subject: [PATCH] Merge branch 'dev-tzy' into DEV_GXC
---
ZigbeeApp/Shared/Phone/Device/AC/ACControlBase.cs | 35 +++++++++++++++++++++++++++--------
1 files changed, 27 insertions(+), 8 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/AC/ACControlBase.cs b/ZigbeeApp/Shared/Phone/Device/AC/ACControlBase.cs
index e075725..9ea6cbb 100644
--- a/ZigbeeApp/Shared/Phone/Device/AC/ACControlBase.cs
+++ b/ZigbeeApp/Shared/Phone/Device/AC/ACControlBase.cs
@@ -3,6 +3,21 @@
{
public class ACControlBase
{
+ #region 鈼� 鍙橀噺_____________________________
+ /// <summary>
+ /// 鏈�浣庢俯搴� 16
+ /// </summary>
+ public const int Temperature_Low=16;
+ /// <summary>
+ /// 鏈�楂樻俯搴� 32氓
+ /// </summary>
+ public const int Temperature_High = 32;
+ /// <summary>
+ /// 榛樿娓╁害
+ /// </summary>
+ public const int Temperature_Default = 26;
+
+ #endregion
#region 鈼� 鑾峰彇妯″紡鍚嶇О_______________________
/// <summary>
@@ -321,7 +336,7 @@
//public static ZigBee.Device.AC.AcMode GetModeByModeId(int modeId)
//{
- //if(modeId==)
+ //if(modeId==)
//}
#endregion
@@ -329,15 +344,19 @@
#region 鈼� 鑾峰彇娓╁害__________________________
public static int GetCurrentModeTemperature(ZigBee.Device.AC ac)
- {
-
- if(ac.currentSystemMode==3)
+ {
+
+ if (ac.currentSystemMode == 3 || ac.currentSystemMode == 8)
{
return ac.currentCoolingSetpoint;
}
- else if(ac.currentSystemMode==4)
+ else if (ac.currentSystemMode == 4)
{
return ac.currentHeatingSetpoint;
+ }
+ else if (ac.currentSystemMode == 1)
+ {
+ return ac.currentAutoSetpoint;
}
return ac.currentLocalTemperature;
}
@@ -372,7 +391,7 @@
/// <param name="ac">Ac.</param>
public static bool IsOpen(ZigBee.Device.AC ac)
{
- if(ac.currentSystemMode==0)
+ if (ac.currentSystemMode == 0)
{
return false;
}
@@ -390,8 +409,8 @@
Application.RunOnMainThread(() =>
{
string msg = Language.StringByID(R.MyInternationalizationString.TheACIsClose);
- var tip = new Phone.UserCenter.TipViewControl(msg, 1000, 1);
- tip.ShowView();
+ //var tip = new Phone.UserCenter.TipViewControl(msg, 1000, 1);
+ //tip.ShowView();
});
}
--
Gitblit v1.8.0