From 944b87b6bcccb095cd73f13f4410fb20faf48f74 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期三, 25 十二月 2019 11:21:06 +0800
Subject: [PATCH] 2019.12.25
---
ZigbeeApp/Shared/Common/SceneTargetDeviceUI.cs | 12 +++---------
1 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/ZigbeeApp/Shared/Common/SceneTargetDeviceUI.cs b/ZigbeeApp/Shared/Common/SceneTargetDeviceUI.cs
index e61dadc..f9dddbd 100644
--- a/ZigbeeApp/Shared/Common/SceneTargetDeviceUI.cs
+++ b/ZigbeeApp/Shared/Common/SceneTargetDeviceUI.cs
@@ -56,13 +56,7 @@
/// 鍞竴鏍囪瘑--HashCode
/// DateTime.Now.ToString("yyyyMMddHHmmss", DateTimeFormatInfo.InvariantInfo)
/// </summary>
- public string SceneTargetDeviceUIID
- {
- get
- {
- return GetHashCode().ToString();
- }
- }
+ public string SceneTargetDeviceUIID = Guid.NewGuid().ToString();
/// <summary>
/// GetDeviceStatu
@@ -112,11 +106,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)
{
--
Gitblit v1.8.0