From 3055ac3c5a7a18db21f2adc6a36f68ae0fd708c2 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 06 五月 2022 14:48:58 +0800
Subject: [PATCH] 定制
---
HDL_ON/Entity/Function/Function.cs | 86 ++++++++++++++++++++++++++++++++++++++++++
1 files changed, 85 insertions(+), 1 deletions(-)
diff --git a/HDL_ON/Entity/Function/Function.cs b/HDL_ON/Entity/Function/Function.cs
index 277fa42..82876da 100644
--- a/HDL_ON/Entity/Function/Function.cs
+++ b/HDL_ON/Entity/Function/Function.cs
@@ -111,12 +111,34 @@
/// <returns></returns>
public string GetAttrState(string key)
{
+ //涓�绾ф煡璇eyValue鍊�
var attrState = attributes.Find((s) => s.key == key.ToString());
- if (attrState == null || string.IsNullOrEmpty(attrState.state))
+ if (attrState == null)
{
return "0";
}
+ if (string.IsNullOrEmpty(attrState.state))
+ {
+ //浜岀骇鏌ヨkeyValue鍊�
+ return GetOriginalState(key);
+ }
return attrState.state;
+ }
+
+ /// <summary>
+ /// 鑾峰彇鍒濆鐘舵��
+ /// 榛樿鍊硷細0
+ /// </summary>
+ /// <param name="key">璇泙瀹氫箟鐨勫睘鎬у��</param>
+ /// <returns></returns>
+ public string GetOriginalState(string key)
+ {
+ var originalState = status.Find((s) => s.key == key.ToString());
+ if (originalState == null || string.IsNullOrEmpty(originalState.value))
+ {
+ return "0";
+ }
+ return originalState.value;
}
/// <summary>
/// 璁剧疆灞炴�х姸鎬�
@@ -169,6 +191,9 @@
break;
case SPK.HvacFan:
iconPath = "electricalfan";
+ break;
+ case SPK.HvacFloorHeat:
+ iconPath = "floorHeatstandard";
break;
case SPK.ElectricTuyaFan2:
iconPath = "electricaltyqborgovyzytytz";
@@ -553,6 +578,13 @@
SaveFunctionFile();
if (pack.Code == StateCode.SUCCESS)
{
+ if (UI.RoomPage.bodyView != null)
+ {
+ Application.RunOnMainThread(() =>
+ {
+ UI.RoomPage.bodyView.ReLoadPage();
+ });
+ }
}
else
{
@@ -698,6 +730,20 @@
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 = extStr;
+ acd.ext_str = extStr;
+ sendDataObj.objects.Add(acd);
+ return sendDataObj;
+ }
+
/// <summary>
/// 鑾峰彇Api鎺у埗鏁版嵁
/// </summary>
@@ -751,6 +797,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鍗忚鐘舵�佽鍙栨牸寮忓璞�
@@ -1207,6 +1271,10 @@
/// 绌鸿皟
/// </summary>
public const string HvacAC = "hvac.ac";
+ /// <summary>
+ /// 姣涚粏绠＄┖璋�
+ /// </summary>
+ public const string HvacCac = "hvac.cac";
/// <summary>
/// 绌鸿皟spk鍒楄〃
@@ -1218,6 +1286,7 @@
spkList.Add(AcStandard);
spkList.Add(HvacAC);
spkList.Add(AcIr);
+ spkList.Add(HvacCac);
return spkList;
}
#endregion
@@ -1373,6 +1442,10 @@
public const string SenesorMegahealth = "sensor.megahealth";
public const string SenesorMegahealth2 = "sensor.megahealth.zg";
/// <summary>
+ /// 绱ф�ュ懠鍙�
+ /// </summary>
+ public const string SensorHelp = "sensor.help";
+ /// <summary>
/// 瀹夐槻浼犳劅鍣╯pk鍒楄〃
/// </summary>
/// <returns></returns>
@@ -1394,6 +1467,17 @@
spkList.Add(SenesorMegahealth2);
return spkList;
}
+
+ /// <summary>
+ /// 闈㈡澘spk鍒楄〃
+ /// </summary>
+ /// <returns></returns>
+ public static List<string> PanelSpkList()
+ {
+ var spkList = new List<string>();
+ spkList.Add(SensorHelp);
+ return spkList;
+ }
#endregion
#region 鐜浼犳劅鍣�
--
Gitblit v1.8.0