From 66a9965c44ecc32a6696abca876ab9d1cd091584 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期五, 28 二月 2020 15:25:13 +0800
Subject: [PATCH] 2020.2.28
---
ZigbeeApp/Shared/Common/SceneTargetDeviceUI.cs | 19 ++++++-------------
1 files changed, 6 insertions(+), 13 deletions(-)
diff --git a/ZigbeeApp/Shared/Common/SceneTargetDeviceUI.cs b/ZigbeeApp/Shared/Common/SceneTargetDeviceUI.cs
index 15f262f..f9dddbd 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;
@@ -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)
{
@@ -159,7 +153,7 @@
}
else if(taskListInfo.Data1==4 || taskListInfo.Data1==5)
{
- tempareture = $"{ taskListInfo.Data2} 鈩�";
+ tempareture = $"{ taskListInfo.Data2/100} 鈩�";
}
else if (taskListInfo.Data1 == 6)
{
@@ -179,7 +173,6 @@
}
return $"{tempareture},{model},{wind}";
}
-
else
{
return null;
--
Gitblit v1.8.0