From eb424d24e39bab4a245725f35deab3f234ea0f13 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期五, 13 十二月 2019 10:48:50 +0800
Subject: [PATCH] 2019.12.13
---
ZigbeeApp/Shared/Common/SceneTargetDeviceUI.cs | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/ZigbeeApp/Shared/Common/SceneTargetDeviceUI.cs b/ZigbeeApp/Shared/Common/SceneTargetDeviceUI.cs
index 15f262f..2c56f46 100644
--- a/ZigbeeApp/Shared/Common/SceneTargetDeviceUI.cs
+++ b/ZigbeeApp/Shared/Common/SceneTargetDeviceUI.cs
@@ -32,8 +32,8 @@
/// </summary>
public int DelayTime = 0;
/// <summary>
- /// 褰揟ype=2鏃跺瓨鍦�
- /// 寤舵椂鎵ц搴忓彿锛岃〃绀虹鍑犱釜寤舵椂鍔ㄤ綔
+ /// 褰揟ype=2鏃跺瓨鍦�
+ /// 寤舵椂鎵ц搴忓彿锛岃〃绀虹鍑犱釜寤舵椂鍔ㄤ綔
/// </summary>
public int DelayTimeSerialNumber = 0;
@@ -112,11 +112,11 @@
{
return null;
}
- if (TaskList[0].Data1 == 0)
+ if (TaskList[0].Data1 == 1)
{
return Language.StringByID(R.MyInternationalizationString.Shut);
}
- return $"{TaskList[0].Data1}%";
+ return $"{TaskList[0].Data2}%";
}
else if (DeviceUI.CommonDevice.Type == ZigBee.Device.DeviceType.Thermostat)
{
@@ -159,7 +159,7 @@
}
else if(taskListInfo.Data1==4 || taskListInfo.Data1==5)
{
- tempareture = $"{ taskListInfo.Data2} 鈩�";
+ tempareture = $"{ taskListInfo.Data2/100} 鈩�";
}
else if (taskListInfo.Data1 == 6)
{
@@ -179,7 +179,6 @@
}
return $"{tempareture},{model},{wind}";
}
-
else
{
return null;
--
Gitblit v1.8.0