From 74a9ba8e9a2df9c39f9c2eb212a5ac889a055cd4 Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期二, 03 十二月 2019 10:47:51 +0800
Subject: [PATCH] 优化UI细节（请合并最新代码）
---
ZigbeeApp/Shared/Phone/Device/AC/ACControlBase.cs | 155 +++++++++++++++++++++++++++++++++++++++------------
1 files changed, 117 insertions(+), 38 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/AC/ACControlBase.cs b/ZigbeeApp/Shared/Phone/Device/AC/ACControlBase.cs
old mode 100644
new mode 100755
index e075725..d30aff2
--- 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>
@@ -225,6 +240,90 @@
#endregion
+ #region 鈼� 鑾峰彇鎵妯″紡鍥剧墖鍚嶇О_____________________
+ /// <summary>
+ /// 閫氳繃鎵妯″紡鑾峰彇閫変腑鍥剧墖
+ /// </summary>
+ /// <returns>The fan mode selected image path by fan mode identifier.</returns>
+ /// <param name="swingMode">Fan mode.</param>
+ public static string GetFanSwingModeSelectedImagePathByFanSwingModeId(int swingMode)
+ {
+ if (swingMode == 0)
+ {
+ return "AC/Swing_1Selected.png";
+ }
+ else if (swingMode == 1)
+ {
+ return "AC/Swing_2Selected.png";
+ }
+ else if (swingMode == 2)
+ {
+ return "AC/Swing_3Selected.png";
+ }
+ else if (swingMode == 3)
+ {
+ return "AC/Swing_4Selected.png";
+ }
+ else if (swingMode == 4)
+ {
+ return "AC/Swing_5Selected.png";
+ }
+ return "AC/Swing_AutoSelected.png";
+ }
+
+ /// <summary>
+ /// 閫氳繃鎵妯″紡鑾峰彇鍥剧墖
+ /// </summary>
+ /// <returns>The fan mode selected image path by fan mode identifier.</returns>
+ /// <param name="swingMode">Fan mode.</param>
+ public static string GetFanSwingModeUnSelectedImagePathByFanSwingModeId(int swingMode)
+ {
+ if (swingMode == 0)
+ {
+ return "AC/Swing_1.png";
+ }
+ else if (swingMode == 1)
+ {
+ return "AC/Swing_2.png";
+ }
+ else if (swingMode == 2)
+ {
+ return "AC/Swing_3.png";
+ }
+ else if (swingMode == 3)
+ {
+ return "AC/Swing_4.png";
+ }
+ else if (swingMode == 4)
+ {
+ return "AC/Swing_5.png";
+ }
+ return "AC/Swing_Auto.png";
+ }
+
+ /// <summary>
+ /// 閫氳繃鎵妯″紡鑾峰彇閫変腑鍥剧墖
+ /// </summary>
+ /// <returns>The fan mode selected image path by fan mode identifier.</returns>
+ /// <param name="swingMode">Fan mode.</param>
+ public static string GetFanSwingModeSelectedImagePathByFanSwingMode(ZigBee.Device.AC.FanSwingMode swingMode)
+ {
+ return GetFanSwingModeSelectedImagePathByFanSwingModeId((int)swingMode);
+ }
+
+ /// <summary>
+ /// 閫氳繃鎵妯″紡鑾峰彇鍥剧墖
+ /// </summary>
+ /// <returns>The fan mode selected image path by fan mode identifier.</returns>
+ /// <param name="swingMode">Fan mode.</param>
+ public static string GetFanSwingModeUnSelectedImagePathByFanSwingMode(ZigBee.Device.AC.FanSwingMode swingMode)
+ {
+ return GetFanSwingModeUnSelectedImagePathByFanSwingModeId((int)swingMode);
+ }
+
+ #endregion
+
+
#region 鈼� 鑾峰彇椋庨�熷浘鐗囧悕绉癬____________________
/// <summary>
@@ -234,15 +333,15 @@
/// <param name="fanMode">Fan mode.</param>
public static string GetFanModeSelectedImagePathByFanModeId(int fanMode)
{
- if(fanMode==1)
+ if(fanMode == 1)
{
return "AC/Fan_LowSelected.png";
}
- else if(fanMode==2)
+ else if(fanMode == 2)
{
return "AC/Fan_MiddleSelected.png";
}
- else if(fanMode==3)
+ else if(fanMode == 3)
{
return "AC/Fan_HeightSelected.png";
}
@@ -278,41 +377,17 @@
/// <param name="fanMode">Fan mode.</param>
public static string GetFanModeSelectedImagePathByFanMode(ZigBee.Device.AC.FanMode fanMode)
{
- if (fanMode == ZigBee.Device.AC.FanMode.Low)
- {
- return GetFanModeSelectedImagePathByFanModeId(1);
- }
- else if (fanMode == ZigBee.Device.AC.FanMode.Medium)
- {
- return GetFanModeSelectedImagePathByFanModeId(2);
- }
- else if (fanMode == ZigBee.Device.AC.FanMode.High)
- {
- return GetFanModeSelectedImagePathByFanModeId(3);
- }
- return GetFanModeSelectedImagePathByFanModeId(1);
+ return GetFanModeSelectedImagePathByFanModeId((int)fanMode);
}
/// <summary>
/// 閫氳繃椋庨�熸ā寮忚幏鍙栭閫熷浘鐗�
/// </summary>
/// <returns>The fan mode selected image path by fan mode identifier.</returns>
- /// <param name="fanMode">Fan mode.</param>
+ /// <param name="swingMode">Fan mode.</param>
public static string GetFanModeUnSelectedImagePathByFanMode(ZigBee.Device.AC.FanMode fanMode)
{
- if (fanMode == ZigBee.Device.AC.FanMode.Low)
- {
- return GetFanModeUnSelectedImagePathByFanModeId(1);
- }
- else if (fanMode == ZigBee.Device.AC.FanMode.Medium)
- {
- return GetFanModeUnSelectedImagePathByFanModeId(2);
- }
- else if (fanMode == ZigBee.Device.AC.FanMode.High)
- {
- return GetFanModeUnSelectedImagePathByFanModeId(3);
- }
- return GetFanModeUnSelectedImagePathByFanModeId(1);
+ return GetFanModeUnSelectedImagePathByFanModeId((int)fanMode);
}
#endregion
@@ -321,7 +396,7 @@
//public static ZigBee.Device.AC.AcMode GetModeByModeId(int modeId)
//{
- //if(modeId==)
+ //if(modeId==)
//}
#endregion
@@ -329,15 +404,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 +451,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 +469,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