From 07b0239f824ddb5a0cadf93f20ff6247f72baca2 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 19 一月 2022 11:32:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wxr0114' into wjc
---
HDL_ON/Entity/Function/Function.cs | 51 ++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 50 insertions(+), 1 deletions(-)
diff --git a/HDL_ON/Entity/Function/Function.cs b/HDL_ON/Entity/Function/Function.cs
index 64bc159..3772dc2 100644
--- a/HDL_ON/Entity/Function/Function.cs
+++ b/HDL_ON/Entity/Function/Function.cs
@@ -170,6 +170,9 @@
case SPK.HvacFan:
iconPath = "electricalfan";
break;
+ case SPK.HvacFloorHeat:
+ iconPath = "floorHeatstandard";
+ break;
case SPK.ElectricTuyaFan2:
iconPath = "electricaltyqborgovyzytytz";
break;
@@ -698,6 +701,24 @@
sendDataObj.objects.Add(acd);
return sendDataObj;
}
+
+ public AlinkDoorlockObj GetGatewayAlinkDoorlockData(string userId,string extStr)
+ {
+ var sendDataObj = new AlinkDoorlockObj();
+ sendDataObj.id = Control.Ins.msg_id.ToString();
+ sendDataObj.time_stamp = Utlis.GetTimestamp();
+ var acd = new AlinkDoorlockStatus();
+ acd.sid = sid;
+ acd.user_id = userId;
+ acd.ext_str = extStr;
+#if DEBUG
+ acd.user_id = "013";
+ acd.ext_str = "999999";
+#endif
+ sendDataObj.objects.Add(acd);
+ return sendDataObj;
+ }
+
/// <summary>
/// 鑾峰彇Api鎺у埗鏁版嵁
/// </summary>
@@ -751,6 +772,24 @@
public string time_stamp = "";
public string id = "";
}
+ /// <summary>
+ /// 闂ㄩ攣閫氳鏁版嵁
+ /// </summary>
+ public class AlinkDoorlockObj
+ {
+ public List<AlinkDoorlockStatus> objects = new List<AlinkDoorlockStatus>();
+ public string time_stamp = "";
+ public string id = "";
+ }
+
+ public class AlinkDoorlockStatus
+ {
+ public string sid;
+ public string user_id;
+ public string ext_str;
+ }
+
+
/// <summary>
/// 鏈湴鐘舵�佽鍙�
/// A鍗忚鐘舵�佽鍙栨牸寮忓璞�
@@ -1110,7 +1149,17 @@
public static class SPK
{
-
+ /// <summary>
+ /// 闂ㄩ攣
+ /// </summary>
+ public const string DoorLock = "security.door";
+
+ public static List<string> GetDoorLockSPKList()
+ {
+ var list = new List<string>();
+ list.Add(DoorLock);
+ return list;
+ }
#region 鐏厜
--
Gitblit v1.8.0