From f5343f3accce0f15295d64f38c098f69674d7e9f Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期二, 08 十二月 2020 18:57:13 +0800
Subject: [PATCH] 2020-12-08 1.更新
---
HDL_ON/Entity/Function/Function.cs | 439 ++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 356 insertions(+), 83 deletions(-)
diff --git a/HDL_ON/Entity/Function/Function.cs b/HDL_ON/Entity/Function/Function.cs
index be61b11..1e58983 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
@@ -13,27 +30,17 @@
public Function()
{
}
- /// <summary>
- /// 鏁版嵁瀛樺偍鏂囦欢鍚�
- /// </summary>
- [Newtonsoft.Json.JsonIgnore]
- public string savePath
- {
- get
- {
- return "FunctionData_" + sid;
- }
- }
+
#region base info
/// <summary>
/// HDL缁熶竴鍗忚鏍煎紡锛�14bytes
/// 涓句緥锛� 鏉ユ簮 鍘傚晢浠ｇ爜 閫氳鏂瑰紡 浜у搧鏃堕棿鎴� 浜у搧绫诲埆 鐗╂ā鍨嬬被 閫氶亾鍙� 澶у皬绫诲埆
- // 1byte 1byte 1byte 4byte 1byte 2byte 2byte 2byte
+ /// 1byte 1byte 1byte 4byte 1byte 2byte 2byte 2byte
/// 鏉ユ簮锛�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
@@ -49,25 +56,95 @@
/// 灏忕被鍒� 1byte 锛堥鐣欙級
/// </summary>
public string sid = "0301011234567801012301230123";
+ /// <summary>
+ /// 澶囨敞
+ /// </summary>
+ public string name;
+ /// <summary>
+ /// 璁惧ID
+ /// 浜戠璐熻矗鐢熸垚
+ /// </summary>
+ public string deviceId = "0";
+ /// <summary>
+ /// 璁惧spk
+ /// </summary>
+ public string spk = "";
+ /// <summary>
+ /// 鍔熻兘绫诲埆
+ /// 濡傦細绌鸿皟绫汇�佺伅鍏夌被銆佺獥甯樼被
+ /// </summary>
+ public FunctionCategory functionCategory
+ {
+ get
+ {
+ try
+ {
+ var _functionCategoryString = sid.Substring(16, 2);
+ var _functionCategory = Convert.ToInt32(_functionCategoryString, 16);
+ return (FunctionCategory)Enum.ToObject(typeof(FunctionCategory), _functionCategory);
+ }
+ catch (Exception ex)
+ {
+ MainPage.Log($"get FunctionCategory error : {ex.Message}");
+ return FunctionCategory.UnKown;
+ }
+ }
+ }
+ ///// <summary>
+ ///// 鍔熻兘绫诲瀷
+ ///// </summary>
+ public FunctionType functionType
+ {
+ get
+ {
+ var _functionTypeString = sid.Substring(16, 4);
+ return (FunctionType)Enum.ToObject(typeof(FunctionType), Convert.ToInt32(_functionTypeString, 16));
+
+ }
+ }
/// <summary>
/// A鍗忚鍔熻兘鐨勭壒鎬�
/// 濡傦細鏄疉C鍔熻兘锛氱壒鎬э細on_off,mode,fan,temperature
/// attri
/// </summary>
- public List<FunctionAttributes> function = new List<FunctionAttributes>();
+ public List<FunctionAttributes> attributes = new List<FunctionAttributes>();
/// <summary>
/// 鎴块棿ID鍒楄〃
/// 璇ュ姛鑳芥坊鍔犲埌鍒版埧闂村垪琛�
/// </summary>
- public List<string> roomIdList = new List<string>();
+ public List<string> roomIds = new List<string>();
/// <summary>
/// bus鍗忚鏁版嵁鏍煎紡
/// 浣跨敤A鍗忚鎺у埗鏃讹紝鏀瑰睘鎬т负绌�
/// </summary>
public BusData bus_Data;
+ /// <summary>
+ /// 鏄惁鏀惰棌
+ /// </summary>
+ public bool collect = false;
+ /// <summary>
+ /// 鏄惁鍦ㄧ嚎
+ /// </summary>
+ public bool online = true;
+ /// <summary>
+ /// 浜戠鏁版嵁鍒涘缓鐨勬椂闂�
+ /// </summary>
+ public string createTime = "";
+ /// <summary>
+ /// 浜戠鏁版嵁淇敼鐨勬渶鍚庢椂闂�
+ /// </summary>
+ public string modifyTime = "";
+ /// <summary>
+ /// 鍒犻櫎鏍囪
+ /// 闇�瑕佸垹闄ゆ暟鎹椂锛屾爣璁颁负锛歵rue
+ /// 鐢变簯绔垹闄ゆ垚鍔熶箣鍚庯紝杩斿洖鏁版嵁鍐嶆竻闄ゆ湰鍦版暟鎹�
+ /// </summary>
+ public bool DeleteSign = false;
+
+ #endregion
/// <summary>
/// 寤舵椂
/// </summary>
@@ -102,43 +179,6 @@
return text;
}
}
- #endregion
-
- /// <summary>
- /// 鍔熻兘绫诲埆
- /// 濡傦細绌鸿皟绫汇�佺伅鍏夌被銆佺獥甯樼被
- /// </summary>
- public FunctionCategory functionCategory
- {
- get
- {
- try
- {
- var _functionCategoryString = sid.Substring(16, 2);
- var _functionCategory = Convert.ToInt32(_functionCategoryString, 16);
- return (FunctionCategory)Enum.ToObject(typeof(FunctionCategory), _functionCategory);
- }
- catch (Exception ex)
- {
- MainPage.Log($"get FunctionCategory error : {ex.Message}");
- return FunctionCategory.UnKown;
- }
- }
- }
-
- public FunctionType functionType
- {
- get
- {
- var _functionTypeString = sid.Substring(16, 4);
- return (FunctionType)Enum.ToObject(typeof(FunctionType), Convert.ToInt32(_functionTypeString, 16));
- }
- }
-
- /// <summary>
- /// 澶囨敞
- /// </summary>
- public string name;
/// <summary>
/// 鏈�鍚庢帶鍒剁殑涓�娆＄姸鎬�
@@ -154,7 +194,7 @@
{
if (_trait_on_off == null)
{
- _trait_on_off = function.Find((obj) => obj.key == "on_off");
+ _trait_on_off = attributes.Find((obj) => obj.key == "on_off");
//鎵句笉鍒板睘鎬ч渶瑕佸０鏄庝竴涓紝闃叉鎶ラ敊闂��
if (_trait_on_off == null)
{
@@ -175,11 +215,6 @@
// _trait_on_off = value;
//}
}
-
- /// <summary>
- /// 鏄惁鏀惰棌
- /// </summary>
- public bool collection = false;
/// <summary>
/// 浣跨敤娆℃暟
@@ -204,7 +239,7 @@
string busId = "";
if (bus_Data != null)
{
- busId = bus_Data.SubnetID + "_" + bus_Data.DeviceID + "_" + bus_Data.LoopID;
+ busId = bus_Data.SubnetID + "_" + bus_Data.DeviceID + "_" + bus_Data.loopId;
}
return busId;
}
@@ -216,9 +251,9 @@
public string GetRoomListName()
{
string roomNameList = "";
- foreach(var roomId in roomIdList)
+ 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;
@@ -227,7 +262,7 @@
{
roomNameList += ",";
}
- roomNameList += findRoom.floorName + findRoom.name;
+ roomNameList += findRoom.floorName + findRoom.roomName;
}
if (roomNameList == "" && functionType == FunctionType.Scene)
{
@@ -236,13 +271,38 @@
return roomNameList;
}
/// <summary>
+ /// 鏁版嵁瀛樺偍鏂囦欢鍚�
+ /// </summary>
+ [Newtonsoft.Json.JsonIgnore]
+ public string savePath
+ {
+ get
+ {
+ return "FunctionData_" + sid;
+ }
+ }
+ /// <summary>
/// 淇濆瓨鍔熻兘鏁版嵁
/// </summary>
public void SaveFunctionData()
{
var ssd = System.Text.Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(this));
- FileUtils.WriteFileByBytes("FunctionData_" + this.sid, ssd);
+ FileUtils.WriteFileByBytes( savePath, ssd);
MainPage.Log($"Save FunctionData {this.functionType} : {this.sid}");
+ }
+
+ /// <summary>
+ /// 杞崲鎴愬満鏅姛鑳藉璞�
+ /// </summary>
+ /// <returns></returns>
+ public SceneFunction ConvertSceneFunction()
+ {
+ var sFunc = new SceneFunction();
+ foreach (var attr in attributes)
+ {
+ sFunc.status.Add(new SceneFunctionStatus() { key = attr.key, value = attr.curValue.ToString() });
+ }
+ return sFunc;
}
/// <summary>
@@ -251,21 +311,18 @@
public DateTime refreshTime = DateTime.MinValue;
/// <summary>
- /// 鑾峰彇鎺у埗鍙戦�佹暟鎹�
+ /// 鑾峰彇鏈湴鎺у埗鏁版嵁
/// </summary>
- public AprotocolControlObj GetControlSendData(Dictionary<string, string> commandDictionary)
+ public GatewayAlinkControlObj GetGatewayAlinkControlData(Dictionary<string, string> commandDictionary)
{
- var sendDataObj = new AprotocolControlObj();
+ var sendDataObj = new GatewayAlinkControlObj();
sendDataObj.id = Control.Ins.msg_id.ToString();
sendDataObj.time_stamp = Control.Ins.Get_TimeStamp();
- var acd = new AprotocolControlData();
+ var acd = new AlinkControlData();
acd.sid = sid;
-#if DEBUG
- acd.sid = "0001016FB925AB02020100010101";
-#endif
- var aca = new AprotocolControlAttribute();
+ var aca = new AlinkControlAttributes();
foreach(var dic in commandDictionary)
{
aca.key = dic.Key;
@@ -277,14 +334,55 @@
return sendDataObj;
}
+ /// <summary>
+ /// 鑾峰彇Api鎺у埗鏁版嵁
+ /// </summary>
+ /// <returns></returns>
+ public ApiAlinkControlActionObj GetApiControlData(Dictionary<string,string> keyValues)
+ {
+ ApiAlinkControlActionObj aaao = new ApiAlinkControlActionObj();
+ aaao.deviceId = this.deviceId;
+ aaao.spk = this.spk;
+ foreach (var kv in keyValues)
+ {
+ aaao.attributes.Add(new AlinkControlAttributes()
+ {
+ key = kv.Key,
+ value = kv.Value,
+ });
+ }
+ return aaao;
+ }
}
/// <summary>
+ /// 杩滅▼鎺у埗
+ /// api a鍗忚鎺у埗鍔ㄤ綔瀵硅薄
+ /// </summary>
+ public class ApiAlinkControlActionObj
+ {
+ /// <summary>
+ /// 璁惧ID
+ /// </summary>
+ public string deviceId = "0";
+ /// <summary>
+ /// spk
+ /// 鍒�:light.switch
+ /// </summary>
+ public string spk = "";
+
+ public List<AlinkControlAttributes> attributes = new List<AlinkControlAttributes>();
+ //[Newtonsoft.Json.JsonIgnore]
+ public BusData bus = new BusData();
+ }
+
+ /// <summary>
+ /// 鏈湴鎺у埗
/// A鍗忚鎺у埗鏁版嵁鐨勫璞�
/// </summary>
- public class AprotocolControlObj
+ public class GatewayAlinkControlObj
{
- public List<AprotocolControlData> objects = new List<AprotocolControlData>();
+ public List<AlinkControlData> objects = new List<AlinkControlData>();
public string time_stamp = "";
public string id = "";
@@ -292,19 +390,26 @@
/// <summary>
/// A鍗忚鎺у埗鏁版嵁
/// </summary>
- public class AprotocolControlData
+ public class AlinkControlData
{
-
public string sid = "";
- public List<AprotocolControlAttribute> status = new List<AprotocolControlAttribute>();
+ public List<AlinkControlAttributes> status = new List<AlinkControlAttributes>();
}
/// <summary>
- /// A鍗忚鎺у埗灞炴�у璞�
+ /// a鍗忚鎺у埗鍔ㄤ綔鏁版嵁
/// </summary>
- public class AprotocolControlAttribute
+ public class AlinkControlAttributes
{
- public string key;
- public string value;
+ /// <summary>
+ /// 灞炴�у悕
+ /// 鍒�:on_off
+ /// </summary>
+ public string key = "";
+ /// <summary>
+ /// 灞炴�у��
+ /// 鍒�:on
+ /// </summary>
+ public string value = "";
}
/// <summary>
@@ -329,17 +434,14 @@
/// 鏈�灏忓��
/// </summary>
public int min;
-
/// <summary>
/// 鏁版嵁绫诲瀷
/// </summary>
public string data_type = "";
-
/// <summary>
/// 褰撳墠鍊�
/// </summary>
public object curValue = new object();
-
//----app鑷畾涔�
/// <summary>
@@ -607,6 +709,48 @@
}
}
/// <summary>
+ /// 鍔熻兘灞炴�ч敭鍚嶅垪琛�
+ /// </summary>
+ public static class FunctionAttributeKey
+ {
+ /// <summary>
+ /// 寮�鍏�
+ /// </summary>
+ public const string OnOff = "on_off";
+ /// <summary>
+ /// 浜害
+ /// </summary>
+ public const string Brightness = "brightness";
+ /// <summary>
+ /// 棰滆壊
+ /// </summary>
+ public const string Color = "color";
+ /// <summary>
+ /// 妯″紡
+ /// </summary>
+ public const string Mode = "mode";
+ /// <summary>
+ /// 椋庨��
+ /// </summary>
+ public const string FanSpeed = "fan";
+ /// <summary>
+ /// 娓╁害
+ /// </summary>
+ public const string Temp = "temperature";
+ /// <summary>
+ /// 寤舵椂
+ /// </summary>
+ public const string Delay = "delay";
+ /// <summary>
+ /// 鑹叉俯
+ /// </summary>
+ public const string CCT = "cct";
+ /// <summary>
+ /// 鐧惧垎姣�
+ /// </summary>
+ public const string Percent = "percent";
+ }
+ /// <summary>
/// 璁惧鍔熻兘oid
/// </summary>
public class FunctionOid
@@ -619,4 +763,133 @@
public string channels;
}
+ /// <summary>
+ /// 鍏煎鏃у崗璁帶鍒�
+ /// </summary>
+ public class BusData
+ {
+ public string addresses = "FFFF";
+ [Newtonsoft.Json.JsonIgnore]
+ public byte SubnetID
+ {
+ get
+ {
+ return Convert.ToByte(addresses.Substring(0, 2), 16);
+ }
+ }
+ [Newtonsoft.Json.JsonIgnore]
+ public byte DeviceID
+ {
+ get
+ {
+ return Convert.ToByte(addresses.Substring(2, 2), 16);
+ }
+ }
+ 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