From 6fa9d69da922c8049f5acfcbb9ce9fd26811024c Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期四, 16 四月 2020 17:10:57 +0800
Subject: [PATCH] 请合并代码
---
ZigbeeApp/Shared/Common/SceneTargetDeviceUI.cs | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/ZigbeeApp/Shared/Common/SceneTargetDeviceUI.cs b/ZigbeeApp/Shared/Common/SceneTargetDeviceUI.cs
index f9dddbd..666855b 100755
--- a/ZigbeeApp/Shared/Common/SceneTargetDeviceUI.cs
+++ b/ZigbeeApp/Shared/Common/SceneTargetDeviceUI.cs
@@ -1,6 +1,7 @@
锘縰sing System;
using System.Collections.Generic;
using System.Globalization;
+using ZigBee.Device;
using static ZigBee.Device.Scene;
namespace Shared.Common
@@ -19,12 +20,12 @@
/// 浠诲姟鍒楄〃涓殑鏁版嵁鍒楄〃
/// Type=0 瀛樺湪
/// </summary>
- public List<TaskListInfo> TaskList = new List<TaskListInfo>();
+ public List<Safeguard.TaskListInfo> TaskList = new List<Safeguard.TaskListInfo>();
/// <summary>
/// 閫夋嫨鐨勮澶�
/// Type=0 瀛樺湪
/// </summary>
- public DeviceUI DeviceUI = new DeviceUI();
+ public CommonDevice DeviceUI = new CommonDevice();
/// <summary>
/// Type=0銆�1銆�2 瀛樺湪
@@ -64,7 +65,7 @@
/// <returns></returns>
public string GetDeviceStatu()
{
- if (DeviceUI.CommonDevice.Type == ZigBee.Device.DeviceType.OnOffOutput)
+ if (DeviceUI.Type == ZigBee.Device.DeviceType.OnOffOutput)
{
if (TaskList.Count == 0)
{
@@ -76,7 +77,7 @@
}
return Language.StringByID(R.MyInternationalizationString.Shut);
}
- else if (DeviceUI.CommonDevice.Type == ZigBee.Device.DeviceType.AirSwitch)
+ else if (DeviceUI.Type == ZigBee.Device.DeviceType.AirSwitch)
{
if (TaskList.Count == 0)
{
@@ -88,7 +89,7 @@
}
return Language.StringByID(R.MyInternationalizationString.Shut);
}
- else if (DeviceUI.CommonDevice.Type == ZigBee.Device.DeviceType.DimmableLight)
+ else if (DeviceUI.Type == ZigBee.Device.DeviceType.DimmableLight)
{
if (TaskList.Count == 0)
{
@@ -100,7 +101,7 @@
}
return $"{(int)(TaskList[0].Data1 * 1.0 / 254 * 100)}%";
}
- else if (DeviceUI.CommonDevice.Type == ZigBee.Device.DeviceType.WindowCoveringDevice)
+ else if (DeviceUI.Type == ZigBee.Device.DeviceType.WindowCoveringDevice)
{
if (TaskList.Count == 0)
{
@@ -112,7 +113,7 @@
}
return $"{TaskList[0].Data2}%";
}
- else if (DeviceUI.CommonDevice.Type == ZigBee.Device.DeviceType.Thermostat)
+ else if (DeviceUI.Type == ZigBee.Device.DeviceType.Thermostat)
{
//娓╁害锛屾ā寮忥紝椋庨��
string tempareture = string.Empty;
--
Gitblit v1.8.0