From a4f57bf9dda3d52e04f537a2ca24db95761eb888 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 11 十二月 2020 11:34:14 +0800
Subject: [PATCH] Revert "Merge branch 'CJL-NEW' into NewFilePath"
---
HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs
index 6eeaa59..86ebc92 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs
@@ -196,7 +196,7 @@
/// <returns></returns>
public static HDL_ON.Entity.Function GetDevice(string sid)
{
- HDL_ON.Entity.Function device = new Entity.Function() { name= "Unknown",sid="璁惧涓嶅瓨鍦�"};
+ HDL_ON.Entity.Function device = new Entity.Function() { name= "Unknown"};
List<HDL_ON.Entity.Function> deviceLists = GetGatewayDeviceList();
foreach (var dev in deviceLists)
{
@@ -216,7 +216,7 @@
/// <returns></returns>
public static HDL_ON.Entity.Scene GetSecne(string sid)
{
- HDL_ON.Entity.Scene scene = new Entity.Scene() { name = "Unknown", sid = "鍦烘櫙涓嶅瓨鍦�" };
+ HDL_ON.Entity.Scene scene = new Entity.Scene() { name = "Unknown"};
List<HDL_ON.Entity.Scene> sceneLists = GetSceneList();
foreach (var sce in sceneLists)
{
@@ -316,7 +316,7 @@
deviceStrTypeList.Add(Language.StringByID(StringId.AC));
}
var floorHeating = deviceList.Find((device) => device.functionType == FunctionType.FloorHeating);
- if (ac != null)
+ if (floorHeating != null)
{
deviceStrTypeList.Add(Language.StringByID(StringId.FloorHeating));
}
--
Gitblit v1.8.0