From f5a49299caaf1fdca7503ae682da13c6fda887c6 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 16 十二月 2020 20:55:55 +0800
Subject: [PATCH] Merge branch 'CJL' into NewFilePath
---
HDL_ON/Entity/Function/Function.cs | 20 ++++++++++++--------
1 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/HDL_ON/Entity/Function/Function.cs b/HDL_ON/Entity/Function/Function.cs
index 7611105..5fd7886 100644
--- a/HDL_ON/Entity/Function/Function.cs
+++ b/HDL_ON/Entity/Function/Function.cs
@@ -119,7 +119,7 @@
/// bus鍗忚鏁版嵁鏍煎紡
/// 浣跨敤A鍗忚鎺у埗鏃讹紝鏀瑰睘鎬т负绌�
/// </summary>
- public BusData bus_Data;
+ public BusData bus;
/// <summary>
/// 鏄惁鏀惰棌
/// </summary>
@@ -206,9 +206,9 @@
public string GetBusId()
{
string busId = "";
- if (bus_Data != null)
+ if (bus != null)
{
- busId = bus_Data.SubnetID + "_" + bus_Data.DeviceID + "_" + bus_Data.loopId;
+ busId = bus.SubnetID + "_" + bus.DeviceID + "_" + bus.loopId;
}
return busId;
}
@@ -295,8 +295,8 @@
{
sFunc.status.Add(new SceneFunctionStatus() { key = attr.key, value = attr.curValue.ToString() });
}
- sFunc.sid = this.sid;
}
+ sFunc.sid = this.sid;
return sFunc;
}
@@ -464,7 +464,11 @@
/// <summary>
/// 棰滆壊
/// </summary>
- public const string Color = "color";
+ public const string RGB = "rgb";
+ /// <summary>
+ /// 娓愬彉鏃堕棿
+ /// </summary>
+ public const string FadeTime = "fade_time";
/// <summary>
/// 妯″紡
/// </summary>
@@ -625,15 +629,15 @@
/// <summary>
/// 瀹剁數銆佹彃搴�
/// </summary>
- public const string ElectricSocket = "electric.socket ";
+ public const string ElectricSocket = "electrical.socket";
/// <summary>
/// 瀹剁數銆佺數瑙�
/// </summary>
- public const string ElectricTV = "electric.tv";
+ public const string ElectricTV = "electrical.tv";
/// <summary>
/// 瀹剁數銆侀鎵�
/// </summary>
- public const string ElectricFan = "electric.fan";
+ public const string ElectricFan = "electrical.fan";
}
}
\ No newline at end of file
--
Gitblit v1.8.0