From f5b46f80546aac860ade6e4c53821e43df833b39 Mon Sep 17 00:00:00 2001
From: tzy <hxb@hdlchina.com.cn>
Date: 星期三, 09 六月 2021 11:11:28 +0800
Subject: [PATCH] Revert "Merge remote-tracking branch 'origin/wxr4' into dev-tzy"
---
HDL_ON/Entity/Function/Function.cs | 67 +++++----------------------------
1 files changed, 11 insertions(+), 56 deletions(-)
diff --git a/HDL_ON/Entity/Function/Function.cs b/HDL_ON/Entity/Function/Function.cs
index dee04dc..f7f94b2 100644
--- a/HDL_ON/Entity/Function/Function.cs
+++ b/HDL_ON/Entity/Function/Function.cs
@@ -1,4 +1,4 @@
-using System;
+锘縰sing System;
using System.Collections.Generic;
using HDL_ON.Common;
using HDL_ON.DAL.Server;
@@ -126,6 +126,7 @@
/// <returns>淇敼缁撴灉</returns>
public bool SetAttrState(string key, object value)
{
+ //var attrState = status.Find((s) => s.key == key.ToString());
var attr = attributes.Find((s) => s.key == key);
if (attr == null)
{
@@ -777,10 +778,6 @@
/// </summary>
public const string Status = "status";
/// <summary>
- /// 姣背娉紶鎰熷櫒锛屽姩浣滅姸鎬�
- /// </summary>
- public const string ActionStatus = "action_state";
- /// <summary>
/// 鐢甸噺鐘舵��
/// </summary>
public const string BatteryState = "battery_state";
@@ -880,14 +877,6 @@
/// </summary>
public const string TuyaWaterTime = "countdown_1";
#endregion
- /// <summary>
- /// 鍔熺巼
- /// </summary>
- public const string Power = "power";
- /// <summary>
- /// 鎬荤數閲�
- /// </summary>
- public const string TotalElectricity = "total_electricity";
}
@@ -945,8 +934,6 @@
public static class SPK
{
-
-
#region 鐏厜
/// <summary>
@@ -1088,11 +1075,6 @@
/// 鑳芥簮妯″潡
/// </summary>
public const string EnergyStandard = "energy.standard";
-
- /// <summary>
- /// 鑳芥簮-鐢佃兘
- /// </summary>
- public const string ElectricEnergy = "energy.electric";
/// <summary>
/// 鑳芥簮spk鍒楄〃
/// </summary>
@@ -1100,7 +1082,7 @@
public static List<string> EnergySpkList()
{
var spkList = new List<string>();
- spkList.Add(ElectricEnergy);
+ spkList.Add(EnergyStandard);
return spkList;
}
#endregion
@@ -1165,10 +1147,6 @@
/// 锛堝共鎺ョ偣锛�
/// </summary>
public const string SensorDryContact = "sensor.dryContact";
- /// <summary>
- /// 姣背娉紶鎰熷櫒
- /// </summary>
- public const string SenesorMegahealth = "sensor.megahealth";
/// <summary>
/// 瀹夐槻浼犳劅鍣╯pk鍒楄〃
@@ -1187,7 +1165,6 @@
spkList.Add(SensorDuiShe);
spkList.Add(SensoruUtrasonic);
spkList.Add(SensorDryContact);
- spkList.Add(SenesorMegahealth);
return spkList;
}
#endregion
@@ -1244,10 +1221,6 @@
/// 绾㈠銆佺數瑙�
/// </summary>
public const string TvIr = "ir.tv";
- /// <summary>
- /// 绾㈠銆佸皬绫崇數瑙�
- /// </summary>
- public const string TvXmIr = "ir.tvxm";
/// <summary>
/// 瀹剁數銆侀鎵�
/// </summary>
@@ -1315,12 +1288,9 @@
spkList.Add(ElectricSocket);
spkList.Add(ElectricTV);
spkList.Add(TvIr);
- spkList.Add(TvXmIr);
spkList.Add(ElectricFan);
spkList.Add(ClothesHanger);
spkList.Add(IrLearn);
- spkList.Add(PjtIr);
- spkList.Add(StbIr);
spkList.Add(ElectricTuyaAirCleaner);
spkList.Add(ElectricTuyaFan);
spkList.Add(ElectricTuyaWeepRobot);
@@ -1331,6 +1301,12 @@
#endregion
+ #region 鑳芥簮
+ /// <summary>
+ /// 鑳芥簮-鐢佃兘
+ /// </summary>
+ public const string ElectricEnergy = "energy.electric";
+ #endregion
#region 璁惧绫�
/// <summary>
@@ -1350,21 +1326,7 @@
}
#endregion
- #region 绗笁鏂箂pk鍒楄〃
- /// <summary>
- /// 鑾峰彇鎵�鏈夌涓夋柟鍝佺墝鍔熻兘鐨剆pk
- /// </summary>
- /// <returns></returns>
- public static List<string> GetAll3tySPK()
- {
- var spkList = new List<string>();
- spkList.Add(ElectricTuyaAirCleaner);
- spkList.Add(ElectricTuyaFan);
- spkList.Add(ElectricTuyaWaterValve);
- spkList.Add(ElectricTuyaWeepRobot);
- spkList.Add(SenesorMegahealth);
- return spkList;
- }
+
/// <summary>
/// 鑾峰彇绗笁鏂硅澶噑pk
/// </summary>
@@ -1375,19 +1337,16 @@
switch (brandType)
{
+ case BrandType.All3tyBrand:
case BrandType.Tuya:
list.Add(ElectricTuyaAirCleaner);
list.Add(ElectricTuyaFan);
list.Add(ElectricTuyaWaterValve);
list.Add(ElectricTuyaWeepRobot);
break;
- case BrandType.All3tyBrand:
- list.Add(SenesorMegahealth);//鍏嗚
- break;
}
return list;
}
- #endregion
/// <summary>
@@ -1398,10 +1357,6 @@
All = 0,
Hdl = 1,
Tuya = 2,
- /// <summary>
- /// 鍏嗚
- /// </summary>
- Megahealth = 3,
All3tyBrand = 999,
--
Gitblit v1.8.0