From 3291885285dfd5d4f665c20676307878dc3163bc Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期五, 20 十二月 2019 16:28:53 +0800
Subject: [PATCH] 请合并最新代码（优化设备不支持的功能）
---
ZigbeeApp/Shared/Common/SceneTargetDeviceUI.cs | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/ZigbeeApp/Shared/Common/SceneTargetDeviceUI.cs b/ZigbeeApp/Shared/Common/SceneTargetDeviceUI.cs
index 15739d4..2c56f46 100755
--- a/ZigbeeApp/Shared/Common/SceneTargetDeviceUI.cs
+++ b/ZigbeeApp/Shared/Common/SceneTargetDeviceUI.cs
@@ -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