From ed9547e90c664739da9d3535bc01f66f24e184db Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 09 六月 2021 17:46:32 +0800
Subject: [PATCH] Merge branch 'tzy2' into wxr6
---
HDL_ON/Entity/Function/Function.cs | 86 ++++++++++++++++++++++++++++++++++++++++--
1 files changed, 81 insertions(+), 5 deletions(-)
diff --git a/HDL_ON/Entity/Function/Function.cs b/HDL_ON/Entity/Function/Function.cs
index 5c0437e..dee04dc 100644
--- a/HDL_ON/Entity/Function/Function.cs
+++ b/HDL_ON/Entity/Function/Function.cs
@@ -1,4 +1,4 @@
-锘縰sing System;
+using System;
using System.Collections.Generic;
using HDL_ON.Common;
using HDL_ON.DAL.Server;
@@ -126,7 +126,6 @@
/// <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)
{
@@ -778,6 +777,10 @@
/// </summary>
public const string Status = "status";
/// <summary>
+ /// 姣背娉紶鎰熷櫒锛屽姩浣滅姸鎬�
+ /// </summary>
+ public const string ActionStatus = "action_state";
+ /// <summary>
/// 鐢甸噺鐘舵��
/// </summary>
public const string BatteryState = "battery_state";
@@ -877,6 +880,14 @@
/// </summary>
public const string TuyaWaterTime = "countdown_1";
#endregion
+ /// <summary>
+ /// 鍔熺巼
+ /// </summary>
+ public const string Power = "power";
+ /// <summary>
+ /// 鎬荤數閲�
+ /// </summary>
+ public const string TotalElectricity = "total_electricity";
}
@@ -934,6 +945,8 @@
public static class SPK
{
+
+
#region 鐏厜
/// <summary>
@@ -1075,6 +1088,11 @@
/// 鑳芥簮妯″潡
/// </summary>
public const string EnergyStandard = "energy.standard";
+
+ /// <summary>
+ /// 鑳芥簮-鐢佃兘
+ /// </summary>
+ public const string ElectricEnergy = "energy.electric";
/// <summary>
/// 鑳芥簮spk鍒楄〃
/// </summary>
@@ -1082,7 +1100,7 @@
public static List<string> EnergySpkList()
{
var spkList = new List<string>();
- spkList.Add(EnergyStandard);
+ spkList.Add(ElectricEnergy);
return spkList;
}
#endregion
@@ -1147,6 +1165,10 @@
/// 锛堝共鎺ョ偣锛�
/// </summary>
public const string SensorDryContact = "sensor.dryContact";
+ /// <summary>
+ /// 姣背娉紶鎰熷櫒
+ /// </summary>
+ public const string SenesorMegahealth = "sensor.megahealth";
/// <summary>
/// 瀹夐槻浼犳劅鍣╯pk鍒楄〃
@@ -1165,6 +1187,7 @@
spkList.Add(SensorDuiShe);
spkList.Add(SensoruUtrasonic);
spkList.Add(SensorDryContact);
+ spkList.Add(SenesorMegahealth);
return spkList;
}
#endregion
@@ -1222,6 +1245,10 @@
/// </summary>
public const string TvIr = "ir.tv";
/// <summary>
+ /// 绾㈠銆佸皬绫崇數瑙�
+ /// </summary>
+ public const string TvXmIr = "ir.tvxm";
+ /// <summary>
/// 瀹剁數銆侀鎵�
/// </summary>
public const string ElectricFan = "electrical.fan";
@@ -1233,6 +1260,30 @@
/// 绾㈠閬ユ帶鍣�
/// </summary>
public const string IrLearn = "ir.learn";
+ /// <summary>
+ /// 绾㈠鎶曞奖浠�
+ /// </summary>
+ public const string PjtIr = "ir.pjt";
+ /// <summary>
+ /// 绾㈠鏈洪《鐩�
+ /// </summary>
+ public const string StbIr = "ir.stb";
+ /// <summary>
+ /// 绾㈠褰辩鏈�
+ /// </summary>
+ public const string DvDIr = "ir.dvd";
+ /// <summary>
+ /// 绾㈠绌烘皵鍑�鍖栧櫒
+ /// </summary>
+ public const string PurifierIr = "ir.air_purifier";
+ /// <summary>
+ /// 绾㈠鐑按鍣�
+ /// </summary>
+ public const string HeaterIr = " ir.water_heater";
+ /// <summary>
+ /// 绾㈠椋庢墖
+ /// </summary>
+ public const string FanIr = "ir.fan";
#region 娑傞甫
/// <summary>
@@ -1264,9 +1315,12 @@
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);
@@ -1276,6 +1330,7 @@
#endregion
+
#region 璁惧绫�
/// <summary>
@@ -1295,7 +1350,21 @@
}
#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>
@@ -1306,16 +1375,19 @@
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>
@@ -1326,6 +1398,10 @@
All = 0,
Hdl = 1,
Tuya = 2,
+ /// <summary>
+ /// 鍏嗚
+ /// </summary>
+ Megahealth = 3,
All3tyBrand = 999,
--
Gitblit v1.8.0