From 71f1df7772feec5cf83feefa851608adac18e005 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期三, 06 十一月 2019 17:45:23 +0800
Subject: [PATCH] 2019.11.6
---
ZigbeeApp/Shared/Common/DeviceUI.cs | 125 ++++++++++++++++++++---------------------
1 files changed, 62 insertions(+), 63 deletions(-)
diff --git a/ZigbeeApp/Shared/Common/DeviceUI.cs b/ZigbeeApp/Shared/Common/DeviceUI.cs
index 1875ac6..6df30d6 100644
--- a/ZigbeeApp/Shared/Common/DeviceUI.cs
+++ b/ZigbeeApp/Shared/Common/DeviceUI.cs
@@ -368,73 +368,72 @@
}
else if (CommonDevice.Type == DeviceType.WindowCoveringDevice)
{
- if ((CommonDevice as ZigBee.Device.Rollershade).WcdCurrentPositionLiftPercentage == 0)
+ if ((CommonDevice as Rollershade).WcdCurrentPositionLiftPercentage == 0)
{
return Language.StringByID(R.MyInternationalizationString.Shut);
}
- return $"{(CommonDevice as ZigBee.Device.Rollershade).WcdCurrentPositionLiftPercentage}%";
+ return $"{(CommonDevice as Rollershade).WcdCurrentPositionLiftPercentage}%";
}
- //else if (CommonDevice.Type == DeviceType.Thermostat)
- //{
- ////娓╁害锛屾ā寮忥紝椋庨��
- //string tempareture = string.Empty;
- //string model = string.Empty;
- //string wind = string.Empty;
- //if (TaskList.Count == 0)
- //{
- // return null;
- //}
- //foreach (var taskListInfo in TaskList)
- //{
- // if (taskListInfo.Data1 == 3)
- // {
- // if (taskListInfo.Data2 == 0)
- // {
- // return Language.StringByID(R.MyInternationalizationString.Shut);
- // }
- // else if (taskListInfo.Data2 == 1)
- // {
- // model = Language.StringByID(R.MyInternationalizationString.Mode_Auto);
- // }
- // else if (taskListInfo.Data2 == 3)
- // {
- // model = Language.StringByID(R.MyInternationalizationString.Mode_Cool);
- // }
- // else if (taskListInfo.Data2 == 4)
- // {
- // model = Language.StringByID(R.MyInternationalizationString.Mode_Heat);
- // }
- // else if (taskListInfo.Data2 == 7)
- // {
- // model = Language.StringByID(R.MyInternationalizationString.Mode_FanOnly);
- // }
- // else if (taskListInfo.Data2 == 8)
- // {
- // model = Language.StringByID(R.MyInternationalizationString.Mode_Dry);
- // }
- // }
- // else if (taskListInfo.Data1 == 4 || taskListInfo.Data1 == 5)
- // {
- // tempareture = $"{ taskListInfo.Data2} 鈩�";
- // }
- // else if (taskListInfo.Data1 == 6)
- // {
- // if (taskListInfo.Data2 == 1)
- // {
- // wind = Language.StringByID(R.MyInternationalizationString.Fan_Low);
- // }
- // else if (taskListInfo.Data2 == 2)
- // {
- // wind = Language.StringByID(R.MyInternationalizationString.Fan_Middle);
- // }
- // else if (taskListInfo.Data2 == 3)
- // {
- // wind = Language.StringByID(R.MyInternationalizationString.Fan_Height);
- // }
- // }
- //}
- //return $"{tempareture},{model},{wind}";
- //}
+ else if (CommonDevice.Type == DeviceType.Thermostat)
+ {
+ //娓╁害锛屾ā寮忥紝椋庨��
+ string tempareture = string.Empty;
+ string model = string.Empty;
+ string wind = string.Empty;
+
+ var ac = CommonDevice as AC;
+
+ if (ac.currentSystemMode == 0)
+ {
+ return Language.StringByID(R.MyInternationalizationString.Shut);
+ }
+ else if (ac.currentSystemMode == 1)
+ {
+ model = Language.StringByID(R.MyInternationalizationString.Mode_Auto);
+ tempareture = $"{ac.currentCoolingSetpoint} 鈩�";
+ }
+ else if (ac.currentSystemMode == 3)
+ {
+ model = Language.StringByID(R.MyInternationalizationString.Mode_Cool);
+ tempareture = $"{ac.currentCoolingSetpoint} 鈩�";
+ }
+ else if (ac.currentSystemMode == 4)
+ {
+ model = Language.StringByID(R.MyInternationalizationString.Mode_Heat);
+ tempareture = $"{ac.currentHeatingSetpoint} 鈩�";
+ }
+ else if (ac.currentSystemMode == 7)
+ {
+ model = Language.StringByID(R.MyInternationalizationString.Mode_FanOnly);
+ }
+ else if (ac.currentSystemMode == 8)
+ {
+ model = Language.StringByID(R.MyInternationalizationString.Mode_Dry);
+ tempareture = $"{ac.currentCoolingSetpoint} 鈩�";
+ }
+
+ if (ac.currentFanMode == 1)
+ {
+ wind = Language.StringByID(R.MyInternationalizationString.Fan_Low);
+ }
+ else if (ac.currentFanMode == 2)
+ {
+ wind = Language.StringByID(R.MyInternationalizationString.Fan_Middle);
+ }
+ else
+ {
+ wind = Language.StringByID(R.MyInternationalizationString.Fan_Height);
+ }
+
+ if (string.IsNullOrEmpty(tempareture))
+ {
+ return $"{model},{wind}";
+ }
+ else
+ {
+ return $"{model},{wind},{tempareture}";
+ }
+ }
else
{
return null;
--
Gitblit v1.8.0