From 1d5e384497c7059e09760628dab3e83eb88f97ae Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期五, 04 十二月 2020 17:48:34 +0800
Subject: [PATCH] 2020-12-04-4
---
HDL_ON/Entity/Function/Function.cs | 147 ++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 140 insertions(+), 7 deletions(-)
diff --git a/HDL_ON/Entity/Function/Function.cs b/HDL_ON/Entity/Function/Function.cs
index 86daa59..29ec0d6 100644
--- a/HDL_ON/Entity/Function/Function.cs
+++ b/HDL_ON/Entity/Function/Function.cs
@@ -6,6 +6,23 @@
namespace HDL_ON.Entity
{
/// <summary>
+ /// 璇诲彇鏈嶅姟鍣ㄧ┖闂翠俊鎭繑鍥炲埌鏁版嵁鍖�
+ /// </summary>
+ public class DevcieApiPack
+ {
+ public List<Function> list = new List<Function>();
+
+ public string totalCount = "0";
+
+ public string totalPage = "0";
+
+ public string pageNo = "0";
+
+ public string pageSize = "0";
+
+ }
+
+ /// <summary>
/// 鍔熻兘绫昏兘婊¤冻鏁版嵁浣跨敤瑕佹眰锛屽瓙绫诲彧鏄负浜嗘柟渚夸娇鐢ㄥ睘鎬�
/// </summary>
public class Function
@@ -23,7 +40,7 @@
/// 鏉ユ簮锛�00 榛樿鍘熺敓鎬佺郴缁熸暟鎹� 銆�01 缃戝叧鎴栬�呭叾浠朅璁惧銆�02 璋冭瘯杞欢銆�03 APP搴旂敤绋嬪簭銆�04 绗笁鏂圭綉鍏虫垨鑰呭钩鍙�
/// 鍘傚晢浠ｇ爜锛�01 HDL
/// 閫氳鏂瑰紡锛�01 HDL Bus銆�02 Zigbee銆�03 KNX銆�04 Z-Wave
- /// 浜у搧鏃堕棿鎴筹細4bytes 浠�2020骞�1鏈�1鏃ョ畻鍑虹殑鏃堕棿鎴�0.1s涓哄崟浣�
+ /// 浜у搧鏃堕棿鎴筹細4bytes 浠�2020骞�1鏈�1鏃ョ畻鍑虹殑鏃堕棿鎴�0.1s涓哄崟浣�
/// 浜у搧绫诲埆锛�01 璋冨厜鍣ㄣ��02 缁х數鍣ㄣ��03 骞叉帴鐐规ā鍧椼��04 浼犳劅鍣ㄣ��05 闈㈡澘
/// 鐗╂ā鍨嬬被鍨嬶細
/// 01 寮�鍏崇被锛�01 寮�鍏炽��02 鎻掑骇銆�03
@@ -108,6 +125,21 @@
/// 鏄惁鏀惰棌
/// </summary>
public bool collect = false;
+ /// <summary>
+ /// 浜戠鏁版嵁鍒涘缓鐨勬椂闂�
+ /// </summary>
+ public string createTime = "";
+ /// <summary>
+ /// 浜戠鏁版嵁淇敼鐨勬渶鍚庢椂闂�
+ /// </summary>
+ public string modifyTime = "";
+ /// <summary>
+ /// 鍒犻櫎鏍囪
+ /// 闇�瑕佸垹闄ゆ暟鎹椂锛屾爣璁颁负锛歵rue
+ /// 鐢变簯绔垹闄ゆ垚鍔熶箣鍚庯紝杩斿洖鏁版嵁鍐嶆竻闄ゆ湰鍦版暟鎹�
+ /// </summary>
+ public bool DeleteSign = false;
+
#endregion
/// <summary>
/// 寤舵椂
@@ -217,7 +249,7 @@
string roomNameList = "";
foreach(var roomId in roomIds)
{
- var findRoom = DB_ResidenceData.rooms.Find(obj => obj.sid == roomId);
+ var findRoom = DB_ResidenceData.residenceData.Rooms.Find(obj => obj.uid == roomId);
if (findRoom == null)
{
continue;
@@ -226,7 +258,7 @@
{
roomNameList += ",";
}
- roomNameList += findRoom.floorName + findRoom.name;
+ roomNameList += findRoom.floorName + findRoom.roomName;
}
if (roomNameList == "" && functionType == FunctionType.Scene)
{
@@ -251,7 +283,7 @@
public void SaveFunctionData()
{
var ssd = System.Text.Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(this));
- FileUtils.WriteFileByBytes( savePath + this.sid, ssd);
+ FileUtils.WriteFileByBytes( savePath, ssd);
MainPage.Log($"Save FunctionData {this.functionType} : {this.sid}");
}
@@ -286,9 +318,6 @@
var acd = new AlinkControlData();
acd.sid = sid;
-#if DEBUG
- acd.sid = "0001016FB925AB02020100010101";
-#endif
var aca = new AlinkControlAttributes();
foreach(var dic in commandDictionary)
{
@@ -751,4 +780,108 @@
public byte loopId;
}
+ public static class SPK
+ {
+ /// <summary>
+ /// 锛堝紑鍏崇伅锛�
+ /// </summary>
+ public const string LightSwitch = "light.switch";
+ /// <summary>
+ /// 锛堣皟鍏夌伅锛�
+ /// </summary>
+ public const string LightDimming = "light.dimming";
+ /// <summary>
+ /// 锛圧GB鐏級
+ /// </summary>
+ public const string LightRGB = "light.rgb";
+ /// <summary>
+ /// 锛圧GBW鐏級
+ /// </summary>
+ public const string LightRGBW = "light.rgbw";
+ /// <summary>
+ /// 锛圕CT鐏級
+ /// </summary>
+ public const string LightCCT = "light.cct";
+ /// <summary>
+ /// 锛堝紑鍏崇獥甯橈級
+ /// </summary>
+ public const string CurtainSwitch = "curtain.switch";
+ /// <summary>
+ /// 锛堝紑鍚堝笜锛�
+ /// </summary>
+ public const string CurtainTrietex = "curtain.trietex";
+ /// <summary>
+ /// 锛堢櫨鍙跺笜锛�
+ /// </summary>
+ public const string CurtainShades = "curtain.shades";
+ /// <summary>
+ /// 锛堝嵎甯橈級
+ /// </summary>
+ public const string CurtainRoller = "curtain.roller";
+ /// <summary>
+ /// 锛堢┖璋冿級
+ /// </summary>
+ public const string AcStandard = "ac.standard";
+ /// <summary>
+ /// 锛堝湴鐑級
+ /// </summary>
+ public const string FloorHeatStandard = "floorHeat.standard";
+ /// <summary>
+ /// 锛堟柊椋庯級
+ /// </summary>
+ public const string AirFreshStandard = "airFresh.standard";
+ /// <summary>
+ /// 锛堥煶涔愶級
+ /// </summary>
+ public const string MusicStandard = "music.standard";
+ /// <summary>
+ /// 锛堜寒搴︿紶鎰熷櫒锛�
+ /// </summary>
+ public const string SensorLight = "sensor.light";
+ /// <summary>
+ /// 锛堟俯搴︿紶鎰熷櫒锛�
+ /// </summary>
+ public const string SensorTemperature = "sensor.temperature";
+ /// <summary>
+ /// (绾㈠绉诲姩浼犳劅鍣�)
+ /// </summary>
+ public const string SensorPir = "sensor.pir";
+ /// <summary>
+ /// 锛堥棬绐椾紶鎰熷櫒锛�
+ /// </summary>
+ public const string SensorDoorWindow = "sensor.doorwindow";
+ /// <summary>
+ /// 锛圥M2.5浼犳劅鍣級
+ /// </summary>
+ public const string SensorPm25 = "sensor.pm25";
+ /// <summary>
+ /// co2浼犳劅鍣�
+ /// </summary>
+ public const string SensorCO2 = "sensor.co2";
+ /// <summary>
+ /// tvoc浼犳劅鍣�
+ /// </summary>
+ public const string SensorTVOC = "sensor.tvoc";
+ /// <summary>
+ /// 婀垮害浼犳劅鍣�
+ /// </summary>
+ public const string SensorHumidity = "sensor.humidity";
+ /// <summary>
+ /// 锛堝共鎺ョ偣锛�
+ /// </summary>
+ public const string DryContact = "dryContact.standard";
+ /// <summary>
+ /// 瀹剁數銆佹彃搴�
+ /// </summary>
+ public const string ElectricSocket = "electric.socket ";
+ /// <summary>
+ /// 瀹剁數銆佺數瑙�
+ /// </summary>
+ public const string ElectricTV = "electric.tv";
+ /// <summary>
+ /// 瀹剁數銆侀鎵�
+ /// </summary>
+ public const string ElectricFan = "electric.fan";
+ }
+
}
--
Gitblit v1.8.0