From 43b0d5870d528f23ecd6aeceb6cfd4325188b46f Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 01 七月 2021 15:50:43 +0800
Subject: [PATCH] Revert "1"

---
 HDL_ON/Entity/Function/Function.cs | 1379 ++++++++++++++++++++++++++++++++++++++++++-----------------
 1 files changed, 967 insertions(+), 412 deletions(-)

diff --git a/HDL_ON/Entity/Function/Function.cs b/HDL_ON/Entity/Function/Function.cs
index 4063399..91adfe7 100644
--- a/HDL_ON/Entity/Function/Function.cs
+++ b/HDL_ON/Entity/Function/Function.cs
@@ -1,5 +1,7 @@
-锘縰sing System;
+using System;
 using System.Collections.Generic;
+using HDL_ON.Common;
+using HDL_ON.DAL.Server;
 using HDL_ON.DriverLayer;
 using Shared;
 
@@ -21,6 +23,36 @@
         public string pageSize = "0";
 
     }
+    /// <summary>
+    /// 灞炴�х姸鎬�
+    /// </summary>
+    public class AttrState
+    {
+        /// <summary>
+        /// 灞炴�ч敭鍚�
+        /// </summary>
+        public string key;
+        /// <summary>
+        /// 灞炴�х殑鍊煎垪琛�
+        /// </summary>
+        public List<string> value = new List<string>();
+        /// <summary>
+        /// 鏈�澶у��
+        /// </summary>
+        public int max = 100;
+        /// <summary>
+        /// 鏈�灏忓��
+        /// </summary>
+        public int min = 0;
+        /// <summary>
+        /// 鏁版嵁绫诲瀷
+        /// </summary>
+        public string data_type = "";
+        /// <summary>
+        /// 褰撳墠鍊�
+        /// </summary>
+        public string curValue = "";
+    }
 
     /// <summary>
     /// 鍔熻兘绫昏兘婊¤冻鏁版嵁浣跨敤瑕佹眰锛屽瓙绫诲彧鏄负浜嗘柟渚夸娇鐢ㄥ睘鎬�
@@ -31,29 +63,116 @@
         {
         }
 
-        #region base info
+        #region 浼樺寲鍖哄煙 2021-02-25
         /// <summary>
-        /// HDL缁熶竴鍗忚鏍煎紡锛�14bytes
-        /// 涓句緥锛� 鏉ユ簮   鍘傚晢浠g爜 閫氳鏂瑰紡  浜у搧鏃堕棿鎴�   浜у搧绫诲埆 鐗╂ā鍨嬬被  閫氶亾鍙�   澶у皬绫诲埆
-        ///       1byte	1byte	1byte	  4byte	    1byte	2byte   2byte   2byte
-        /// 鏉ユ簮锛�00	榛樿鍘熺敓鎬佺郴缁熸暟鎹� 銆�01	缃戝叧鎴栬�呭叾浠朅璁惧銆�02	璋冭瘯杞欢銆�03	APP搴旂敤绋嬪簭銆�04	绗笁鏂圭綉鍏虫垨鑰呭钩鍙�
-        /// 鍘傚晢浠g爜锛�01	HDL
-        /// 閫氳鏂瑰紡锛�01	HDL Bus銆�02	Zigbee銆�03 KNX銆�04 Z-Wave
-        /// 浜у搧鏃堕棿鎴筹細4bytes	浠�2020骞�1鏈�1鏃ョ畻鍑虹殑鏃堕棿鎴�0.1s涓哄崟浣� 
-        /// 浜у搧绫诲埆锛�01	璋冨厜鍣ㄣ��02 缁х數鍣ㄣ��03	骞叉帴鐐规ā鍧椼��04	浼犳劅鍣ㄣ��05 闈㈡澘
-        /// 鐗╂ā鍨嬬被鍨嬶細
-        ///     01	寮�鍏崇被锛�01 寮�鍏炽��02 鎻掑骇銆�03	
-        ///     02	鐓ф槑锛� 01 寮�鍏炽��02	璋冨厜銆�03	鑹叉俯銆�04	LED
-        ///     03	閬槼锛� 01	绐楀笜鐢垫満銆�02 鐧惧彾绐椼��03 寮�鍚堝笜銆�04 鍗峰笜
-        ///     04	鎭掓俯鍣細01 绌鸿皟銆�02 鍦版殩銆�03 姣涚粏绌鸿皟
-        ///     05	鏂伴		
-        ///     06	褰遍煶		
-        ///     07	闊充箰		
-        ///     08	鑳芥簮		
-        ///     09	瀹夐槻
-        /// 澶х被鍒�	1bytes	锛堥鐣欙級
-        /// 灏忕被鍒�	1byte	锛堥鐣欙級
+        /// 鏇存柊鐨勬渶鍚庢椂闂�
         /// </summary>
+        public string time_stamp = "1615261019796";
+
+        public string GeteTime()
+        {
+            try
+            {
+                DateTime startTime = TimeZone.CurrentTimeZone.ToLocalTime(new DateTime(1970, 1, 1)); // 褰撳湴鏃跺尯
+                return startTime.AddMilliseconds(Convert.ToDouble(time_stamp)).ToString("s");
+            }
+            catch {
+                return DateTime.MinValue.ToString("s");
+            }
+        }
+        /// <summary>
+        /// 鑾峰彇灞炴�у垪琛�
+        /// </summary>
+        /// <returns></returns>
+        public List<string> GetAttributes()
+        {
+            var attrs = new List<string>();
+
+            foreach(var attr in  attributes)
+            {
+                attrs.Add(attr.key);
+            }
+            return attrs;
+        }
+        /// <summary>
+        /// 鑾峰彇鎸囧畾灞炴��
+        /// </summary>
+        /// <returns></returns>
+        public FunctionAttributes GetAttribute(string key)
+        {
+            var attr = attributes.Find((a) => a.key == key);
+            return attr;
+        }
+
+        /// <summary>
+        /// 鑾峰彇灞炴�у綋鍓嶇姸鎬�
+        /// </summary>
+        /// <param name="key"></param>
+        /// <returns></returns>
+        public string GetAttrState(string key)
+        {
+            var attrState = attributes.Find((s) => s.key == key.ToString());
+            if (attrState == null || string.IsNullOrEmpty(attrState.state))
+            {
+                return "0";
+            }
+            return attrState.state;
+        }
+        /// <summary>
+        /// 璁剧疆灞炴�х姸鎬�
+        /// </summary>
+        /// <param name="key"></param>
+        /// <param name="value"></param>
+        /// <returns>淇敼缁撴灉</returns>
+        public bool SetAttrState(string key, object value)
+        {
+            var attr = attributes.Find((s) => s.key == key);
+            if (attr == null)
+            {
+                return false;
+            }
+            else
+            {
+                attr.state = value.ToString();
+                attr.curValue = value.ToString();
+            }
+            return true;
+        }
+
+        /// <summary>
+        /// icon鏂囦欢鍚嶇О
+        /// </summary>
+        public string IconName
+        {
+            get
+            {
+                return spk.Replace(".","");
+            }
+        }
+
+
+        /// <summary>
+        /// 鐗堟湰鏁版嵁鍒楄〃
+        /// </summary>
+        public List<VersionInfo> versions = new List<VersionInfo>();
+
+        /// <summary>
+        /// 涓婁竴娆℃墦寮�鐨勪寒搴�
+        /// 鐏厜绉佹湁灞炴��
+        /// </summary>
+        [Newtonsoft.Json.JsonIgnore]
+        public int lastBrightness = 100;
+
+        /// <summary>
+        /// 宸ヤ綔妯″紡瀵瑰簲鐨勫伐浣滄俯搴�
+        /// 鍦扮儹绉佹湁灞炴��
+        /// </summary>
+        [Newtonsoft.Json.JsonIgnore]
+        public Dictionary<string, byte> Fh_Mode_Temp = new Dictionary<string, byte>();
+        #endregion
+
+
+        #region base info    
         public string sid = "0301011234567801012301230123";
         /// <summary>
         /// 澶囨敞
@@ -68,40 +187,25 @@
         /// 璁惧spk
         /// </summary>
         public string spk = "";
+
+        string spk_Prefix;
         /// <summary>
+        /// spk鍓嶇紑
+        /// 澶х被
         /// 鍔熻兘绫诲埆
         /// 濡傦細绌鸿皟绫汇�佺伅鍏夌被銆佺獥甯樼被
         /// </summary>
-        public FunctionCategory functionCategory
+        public string Spk_Prefix
         {
             get
             {
-                try
+                if (string.IsNullOrEmpty(spk_Prefix))
                 {
-                    var _functionCategoryString = sid.Substring(16, 2);
-                    var _functionCategory = Convert.ToInt32(_functionCategoryString, 16);
-                    return (FunctionCategory)Enum.ToObject(typeof(FunctionCategory), _functionCategory);
+                    spk_Prefix = spk.Split(".")[0];
                 }
-                catch (Exception ex)
-                {
-                    MainPage.Log($"get FunctionCategory error : {ex.Message}");
-                    return FunctionCategory.UnKown;
-                }
+                return spk_Prefix;
             }
         }
-        ///// <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
@@ -119,7 +223,7 @@
         /// bus鍗忚鏁版嵁鏍煎紡
         /// 浣跨敤A鍗忚鎺у埗鏃讹紝鏀瑰睘鎬т负绌�
         /// </summary>
-        public BusData bus_Data;
+        public BusData bus;
         /// <summary>
         /// 鏄惁鏀惰棌
         /// </summary>
@@ -136,49 +240,12 @@
         /// 浜戠鏁版嵁淇敼鐨勬渶鍚庢椂闂�
         /// </summary>
         public string modifyTime = "";
-        /// <summary>
-        /// 鍒犻櫎鏍囪
-        /// 闇�瑕佸垹闄ゆ暟鎹椂锛屾爣璁颁负锛歵rue
-        /// 鐢变簯绔垹闄ゆ垚鍔熶箣鍚庯紝杩斿洖鏁版嵁鍐嶆竻闄ゆ湰鍦版暟鎹�
-        /// </summary>
-        public bool DeleteSign = false;
 
         #endregion
         /// <summary>
         /// 寤舵椂
         /// </summary>
         public int delay = 0;
-        /// <summary>
-        /// 寤舵椂鏄剧ず鐨勬枃鏈�
-        /// </summary>
-        [Newtonsoft.Json.JsonIgnore]
-        public string delayText
-        {
-            get
-            {
-                string text = "";
-                switch (delay)
-                {
-                    case 0:
-                        text = Language.StringByID(StringId.NoDelay);
-                        break;
-                    case 30:
-                        text = "30s";
-                        break;
-                    case 60:
-                        text = "1min";
-                        break;
-                    case 120:
-                        text = "2min";
-                        break;
-                    case 300:
-                        text = "5min";
-                        break;
-                }
-                return text;
-            }
-        }
-
         /// <summary>
         /// 鏈�鍚庢帶鍒剁殑涓�娆$姸鎬�
         /// </summary>
@@ -193,7 +260,7 @@
             {
                 if (_trait_on_off == null)
                 {
-                    _trait_on_off = attributes.Find((obj) => obj.key == "on_off");
+                    _trait_on_off = attributes.Find((obj) => obj.key == FunctionAttributeKey.OnOff);
                     //鎵句笉鍒板睘鎬ч渶瑕佸0鏄庝竴涓紝闃叉鎶ラ敊闂��
                     if (_trait_on_off == null)
                     {
@@ -204,28 +271,29 @@
                             max = 1,
                             min = 0,
                         };
+                        _trait_on_off.curValue = "off";
                     }
-                    _trait_on_off.curValue = "on";
+                }
+                if(_trait_on_off.curValue.ToString() != "on"&& _trait_on_off.curValue.ToString() != "off" && _trait_on_off.curValue.ToString() != "stop")
+                {
+                    _trait_on_off.curValue = "off";
                 }
                 return _trait_on_off;
             }
-            //set
-            //{
-            //    _trait_on_off = value;
-            //}
         }
 
         /// <summary>
         /// 浣跨敤娆℃暟
         /// </summary>
-        public double usageCount = 0;
+        public double controlCounter = 0;
         /// <summary>
         /// 浣跨敤棰戠巼
         /// </summary>
-        public double usageFrequency {
+        public double usageFrequency
+        {
             get
             {
-                return usageCount / 7;
+                return controlCounter / 7;
             }
         }
         /// <summary>
@@ -233,12 +301,77 @@
         /// </summary>
         public int fixedSerialNumber = int.MaxValue;
 
+        /// <summary>
+        /// 鏀惰棌鍔熻兘
+        /// </summary>
+        public void CollectFunction()
+        {
+            var result = "";
+
+            new System.Threading.Thread(() =>
+            {
+                if (collect)
+                {
+                    result = ApiUtlis.Ins.HttpRequest.CollectDevice(deviceId).Code;
+                }
+                else
+                {
+                    result = ApiUtlis.Ins.HttpRequest.CancelCollectDevice(deviceId).Code;
+                }
+                //鎻愮ず閿欒
+                if (result != StateCode.SUCCESS)
+                {
+                    Application.RunOnMainThread(() =>
+                    {
+                        collect = !collect;
+                        IMessageCommon.Current.ShowErrorInfoAlter(result);
+                    });
+                }else
+                {
+                    Application.RunOnMainThread(() =>
+                    {
+                        UI.HomePage.RefreshFunctionView();
+                    });
+                }
+            })
+            { IsBackground = true }.Start();
+        }
+        /// <summary>
+        /// 缂栬緫鍔熻兘缁戝畾鎴块棿淇℃伅
+        /// </summary>
+        public void EditBindRoomInfo(string roomId)
+        {
+            var result = "";
+
+            new System.Threading.Thread(() =>
+            {
+                if (collect)
+                {
+                    result = ApiUtlis.Ins.HttpRequest.BindDeviceToRoom(new List<string>() { deviceId }, new List<string>() { roomId }).Code;
+                }
+                else
+                {
+                    result = ApiUtlis.Ins.HttpRequest.UnbindDeviceToRoom(deviceId,roomId);
+                }
+                //鎻愮ず閿欒
+                if (result != StateCode.SUCCESS)
+                {
+                    Application.RunOnMainThread(() =>
+                    {
+                        collect = !collect;
+                        IMessageCommon.Current.ShowErrorInfoAlter(result);
+                    });
+                }
+            })
+            { IsBackground = true }.Start();
+        }
+
         public string GetBusId()
         {
             string busId = "";
-            if (bus_Data != null)
+            if (bus != null)
             {
-                busId = bus_Data.SubnetID + "_" + bus_Data.DeviceID + "_" + bus_Data.loopId;
+                busId = bus.SubnetID + "_" + bus.DeviceID + "_" + bus.LoopId;
             }
             return busId;
         }
@@ -261,11 +394,11 @@
                 {
                     roomNameList += ",";
                 }
-                roomNameList += findRoom.floorName + findRoom.roomName;
+                roomNameList += findRoom.floorName +"-"+ findRoom.roomName;
             }
-            if (roomNameList == "" && functionType == FunctionType.Scene)
+            if (roomNameList == "" )
             {
-                roomNameList = Language.StringByID(StringId.WholeHouseScene);
+                roomNameList = Language.StringByID(StringId.WholeZone);
             }
             return roomNameList;
         }
@@ -280,32 +413,75 @@
                 return "FunctionData_" + sid;
             }
         }
+
         /// <summary>
-        /// 淇濆瓨鍔熻兘鏁版嵁
+        /// 淇濆瓨鍔熻兘鏂囦欢
         /// </summary>
-        public void SaveFunctionData(bool upSevser)
+        public void SaveFunctionFile()
         {
-            if (upSevser)
+            var ssd = System.Text.Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(this));
+            FileUtlis.Files.WriteFileByBytes(savePath, ssd);
+        }
+        /// <summary>
+        /// 淇濆瓨鎴块棿缁戝畾淇℃伅
+        /// </summary>
+        public void UpdataRoomIds()
+        {
+            new System.Threading.Thread(() =>
             {
-                var pm = new DAL.Server.HttpServerRequest();
-                var pack = pm.UpdataDevcieInfo(this);
-                if (pack.Code == DAL.Server.StateCode.SUCCESS)
+                var pack = ApiUtlis.Ins.HttpRequest.UpdataDevcieBindRoomInfo(this);
+                //鐩存帴淇濆瓨鏈湴锛�
+                SaveFunctionFile();
+                if (pack.Code == StateCode.SUCCESS)
                 {
-                    var ssd = System.Text.Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(this));
-                    Common.FileUtlis.Files.WriteFileByBytes(savePath, ssd);
                 }
                 else
                 {
-                    Utlis.ShowTip(Language.StringByID(StringId.EditFunctionInfoFail) + "\r\nCode:" + pack.Code);
+                    IMessageCommon.Current.ShowErrorInfoAlter(pack.Code);
                 }
-            }
-            else
-            {
-                var ssd = System.Text.Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(this));
-                Common.FileUtlis.Files.WriteFileByBytes(savePath, ssd);
-            }
+            })
+            { IsBackground = true }.Start();
         }
-      
+        /// <summary>
+        /// 鏇存柊鍔熻兘淇℃伅
+        /// </summary>
+        public void UpdataFuncitonInfo()
+        {
+            new System.Threading.Thread(() =>
+            {
+                var pm = new HttpServerRequest();
+                var pack = pm.UpdataDevcieInfo(this);
+                SaveFunctionFile();
+                if (pack.Code == StateCode.SUCCESS)
+                {
+                }
+                else
+                {
+                    IMessageCommon.Current.ShowErrorInfoAlter(pack.Code);
+                }
+            })
+            { IsBackground = true }.Start();
+        }
+        /// <summary>
+        /// 鏇存柊鍔熻兘鍚嶇О
+        /// </summary>
+        public void UpdataFunctionName()
+        {
+            new System.Threading.Thread(() =>
+            {
+                var pm = new HttpServerRequest();
+                var pack = pm.UpdataDevcieInfo(this);
+                SaveFunctionFile();
+                if (pack.Code == StateCode.SUCCESS)
+                {
+                }
+                else
+                {
+                    IMessageCommon.Current.ShowErrorInfoAlter(pack.Code);
+                }
+            })
+            { IsBackground = true }.Start();
+        }
 
         /// <summary>
         /// 杞崲鎴愬満鏅姛鑳藉璞�
@@ -316,9 +492,40 @@
             var sFunc = new SceneFunction();
             foreach (var attr in attributes)
             {
-                sFunc.status.Add(new SceneFunctionStatus() { key = attr.key, value = attr.curValue.ToString() });
-                sFunc.sid = this.sid;
+                switch (attr.key)
+                {
+                    case FunctionAttributeKey.OnOff:
+                    case FunctionAttributeKey.Brightness:
+                    case FunctionAttributeKey.Mode:
+                    case FunctionAttributeKey.SetTemp:
+                    case FunctionAttributeKey.FanSpeed:
+                    case FunctionAttributeKey.Percent:
+                    //case FunctionAttributeKey.FadeTime:
+                        if (attr.curValue.ToString() == "{}")
+                        {
+                            if (attr.key == FunctionAttributeKey.OnOff)
+                            {
+                                attr.curValue = "off";
+                            }
+                            else
+                            {
+                                attr.curValue = "0";
+                            }
+                        }
+                        if (attr.key == FunctionAttributeKey.SetTemp)
+                        {
+                            double vv = 16;
+                            Double.TryParse(attr.curValue.ToString(), out vv);
+                            sFunc.status.Add(new SceneFunctionStatus() { key = attr.key, value = Convert.ToInt32(vv).ToString() });
+                        }
+                        else
+                        {
+                            sFunc.status.Add(new SceneFunctionStatus() { key = attr.key, value = attr.curValue.ToString() });
+                        }
+                        break;
+                }
             }
+            sFunc.sid = this.sid;
             return sFunc;
         }
 
@@ -334,21 +541,17 @@
         {
             var sendDataObj = new AlinkFunctionStatusObj();
             sendDataObj.id = Control.Ins.msg_id.ToString();
-            sendDataObj.time_stamp = Control.Ins.Get_TimeStamp();
-
-
-            var acd = new AlinkControlData();
+            sendDataObj.time_stamp = Utlis.GetTimestamp();
+            var acd = new AlinkStatusData();
             acd.sid = sid;
-            var aca = new AlinkControlAttributes();
             foreach (var dic in commandDictionary)
             {
+                var aca = new AttributesStatus();
                 aca.key = dic.Key;
                 aca.value = dic.Value;
                 acd.status.Add(aca);
             }
-
             sendDataObj.objects.Add(acd);
-
             return sendDataObj;
         }
         /// <summary>
@@ -360,9 +563,10 @@
             ApiAlinkControlActionObj aaao = new ApiAlinkControlActionObj();
             aaao.deviceId = this.deviceId;
             aaao.spk = this.spk;
+            aaao.bus = this.bus;
             foreach (var kv in keyValues)
             {
-                aaao.attributes.Add(new AlinkControlAttributes()
+                aaao.attributes.Add(new AttributesStatus()
                 {
                     key = kv.Key,
                     value = kv.Value,
@@ -388,7 +592,7 @@
         /// </summary>
         public string spk = "";
 
-        public List<AlinkControlAttributes> attributes = new List<AlinkControlAttributes>();
+        public List<AttributesStatus> attributes = new List<AttributesStatus>();
         //[Newtonsoft.Json.JsonIgnore]
         public BusData bus = new BusData();
     }
@@ -398,7 +602,7 @@
     /// </summary>
     public class AlinkFunctionStatusObj
     {
-        public List<AlinkControlData> objects = new List<AlinkControlData>();
+        public List<AlinkStatusData> objects = new List<AlinkStatusData>();
 
         public string time_stamp = "";
         public string id = "";
@@ -414,17 +618,29 @@
         public string time_stamp = "";
     }
     /// <summary>
-    /// A鍗忚鎺у埗鏁版嵁
+    /// A鍗忚鐘舵�佹暟鎹�
     /// </summary>
-    public class AlinkControlData
+    public class AlinkStatusData
     {
+        /*
+         mqtt鎺ユ敹鐨勭姸鎬佹暟鎹病鏈塪eviceId
+        鎺ュ彛鍙嶉鐨勬暟鎹湁
+         */
+        /// <summary>
+        /// 
+        /// </summary>
         public string sid = "";
-        public List<AlinkControlAttributes> status = new List<AlinkControlAttributes>();
+        /// <summary>
+        /// 璁惧ID
+        /// 浜戠璐熻矗鐢熸垚
+        /// </summary>
+        public string deviceId = "0";
+        public List<AttributesStatus> status = new List<AttributesStatus>();
     }
     /// <summary>
     /// a鍗忚鎺у埗鍔ㄤ綔鏁版嵁
     /// </summary>
-    public class AlinkControlAttributes
+    public class AttributesStatus
     {
         /// <summary>
         /// 灞炴�у悕
@@ -442,6 +658,7 @@
     /// 鍔熻兘灞炴��
     /// 灞炴�у瓧娈佃В鏋愶細attri :灞炴�у唴瀹癸紝value 灞炴�х殑鍊硷紝max 鏈�澶у�� min 鏈�灏忓��
     /// </summary>
+    [System.Serializable]
     public class FunctionAttributes
     {
         /// <summary>
@@ -455,290 +672,30 @@
         /// <summary>
         /// 鏈�澶у��
         /// </summary>
-        public int max=100;
+        public int max = 100;
         /// <summary>
         /// 鏈�灏忓��
         /// </summary>
-        public int min=0;
+        public int min = 0;
         /// <summary>
         /// 鏁版嵁绫诲瀷
         /// </summary>
         public string data_type = "";
         /// <summary>
+        /// 褰撳墠鐘舵��
+        /// </summary>
+        public string state = "";
+        /// <summary>
         /// 褰撳墠鍊�
         /// </summary>
         public object curValue = new object();
-
-        //----app鑷畾涔�
-        /// <summary>
-        /// 灞炴�у�煎崟浣�
-        /// </summary>
-        string _uintString;
-        [Newtonsoft.Json.JsonIgnore]
-        public string uintString
-        {
-            get
-            {
-                if (!string.IsNullOrEmpty(_uintString))
-                {
-                    return _uintString;
-                }
-                var us = "";
-                switch (key)
-                {
-                    case "temperature":
-                    case "set_temperature":
-                        us = "掳C";
-                        break;
-                    case "percent":
-                    case "brightness":
-                        us = "%";
-                        break;
-                }
-                return us;
-            }
-        }
-
-        /// <summary>
-        /// 灞炴�у悕绉版樉绀烘枃鏈�
-        /// 涓嫳鏂囨樉绀�
-        /// </summary>
-        [Newtonsoft.Json.JsonIgnore]
-        public string name_text
-        {
-            get
-            {
-                string text = "";
-                switch (key)
-                {
-                    case "on_off":
-                        text = Language.StringByID(StringId.OnOff);
-                        break;
-                    case "brightness":
-                        text = Language.StringByID(StringId.Brightness);
-                        break;
-                    case "color":
-                        text = Language.StringByID(StringId.ColorValue);
-                        break;
-                    case "mode":
-                        text = Language.StringByID(StringId.Mode);
-                        break;
-                    case "fan":
-                        text = Language.StringByID(StringId.FanSpeed);
-                        break;
-                    case "temperature":
-                case "set_temperature":
-                        text = Language.StringByID(StringId.Temp);
-                        break;
-                    case "delay":
-                        text = Language.StringByID(StringId.Delay);
-                        break;
-                    case "cct":
-                        text = "CCT";
-                        break;
-                    //case "fade_time":
-                    case "percent":
-                        text = Language.StringByID(StringId.PercentAdjustment);
-                        break;
-                        //case "lock":
-                        //case "ico":
-                        //case "swing":
-                        //case "set_point":
-                        //case "pm25":
-                        //case "volume":
-                        //case "vol_step":
-                        //case "source":
-                        //case "treble":
-                        //case "bass":
-                        //case "playlist":
-                        //case "song_name":
-                        //case "current_status":
-                        //case "enable":
-                        //case "lux":
-                        //case "adjust_value":
-                        //case "range":
-                        //case "humidity":
-                        //case "type":
-                        //case "state":
-                        //case "sensitivity":
-                        //case "pm25value":
-                }
-                return text;
-            }
-        }
-
-        /// <summary>
-        /// 鑾峰彇褰撳墠灞炴�х殑鏄剧ず鏂囨湰
-        /// 涓嫳鏂囨樉绀�
-        /// </summary>
-        public string GetCurValueText()
-        {
-            return GetValueText(curValue.ToString());
-        }
-
-        /// <summary>
-        /// 鑾峰彇鎸囧畾灞炴�х殑鏄剧ず鏂囨湰
-        /// 涓嫳鏂囨樉绀�
-        /// </summary>
-        public string GetValueText(string value)
-        {
-            string text = "";
-            value = value.Replace("{}", "");
-            switch (key)
-            {
-                case "on_off":
-                    text = value == "on" ? Language.StringByID(StringId.On) : Language.StringByID(StringId.OFF);
-                    break;
-                case "temperature":
-                case "set_temperature":
-                case "brightness":
-                case "percent":
-                    if (value == "")
-                    {
-                        this.curValue = this.min;
-                        text = this.min.ToString();
-                    }
-                    else
-                    {
-                        text = value;
-                    }
-                    break;
-                //case "color":
-                case "mode":
-                    switch (value)
-                    {
-                        //----绌鸿皟
-                        case "auto":
-                            text = Language.StringByID(StringId.Auto);
-                            break;
-                        case "cool":
-                            text = Language.StringByID(StringId.Cool);
-                            break;
-                        case "heat":
-                            text = Language.StringByID(StringId.Heat);
-                            break;
-                        case "dry":
-                            text = Language.StringByID(StringId.Dry);
-                            break;
-                        case "fan":
-                            text = Language.StringByID(StringId.AirSupply);
-                            break;
-                        //-----鍦扮儹
-                        case "day":
-                            text = Language.StringByID(StringId.Day);
-                            break;
-                        case "night":
-                            text = Language.StringByID(StringId.Night);
-                            break;
-                        case "away":
-                            text = Language.StringByID(StringId.Away);
-                            break;
-                        case "normal":
-                            text = Language.StringByID(StringId.Normal);
-                            break;
-                        case "timer":
-                            text = Language.StringByID(StringId.Timer);
-                            break;
-                        default:
-                            if (this.value.Contains("cool"))
-                            {
-                                this.curValue = "cool";
-                                text = Language.StringByID(StringId.Cool);
-                            }
-                            else if (this.value.Contains("day"))
-                            {
-                                this.curValue = "day";
-                                text = Language.StringByID(StringId.Day);
-                            }
-                            else
-                            {
-                                foreach (var v in this.value)
-                                {
-                                    this.curValue = v;
-                                    text = GetCurValueText();
-                                }
-                            }
-                            break;
-                    }
-                    break;
-                case "fan":
-                    switch (value)
-                    {
-                        case "high":
-                            text = Language.StringByID(StringId.HighWindSpeed);
-                            break;
-                        case "medium":
-                            text = Language.StringByID(StringId.MiddleWindSpeed);
-                            break;
-                        case "low":
-                            text = Language.StringByID(StringId.LowWindSpeed);
-                            break;
-                        case "auto":
-                            text = Language.StringByID(StringId.Auto);
-                            break;
-                        default:
-                            if (this.value.Contains("low"))
-                            {
-                                this.curValue = "low";
-                                text = Language.StringByID(StringId.LowWindSpeed);
-                            }
-                            else
-                            {
-                                foreach (var v in this.value)
-                                {
-                                    this.curValue = v;
-                                    text = GetCurValueText();
-                                }
-                            }
-                            break;
-                    }
-                    break;
-                //case "delay":
-                //case "cct":
-                //case "fade_time":
-                //case "lock":
-                //case "ico":
-                //case "swing":
-                //case "set_point":
-                //case "pm25":
-                //case "volume":
-                //case "vol_step":
-                //case "source":
-                //case "treble":
-                //case "bass":
-                //case "playlist":
-                //case "song_name":
-                //case "current_status":
-                //case "enable":
-                //case "lux":
-                //case "adjust_value":
-                //case "range":
-                //case "humidity":
-                //case "type":
-                //case "state":
-                //case "sensitivity":
-                //case "pm25value":
-                case "high":
-                    text = Language.StringByID(StringId.HighWindSpeed);
-                    break;
-                case "medium":
-                    text = Language.StringByID(StringId.MiddleWindSpeed);
-                    break;
-                case "low":
-                    text = Language.StringByID(StringId.LowWindSpeed);
-                    break;
-                case "auto":
-                    text = Language.StringByID(StringId.Auto);
-                    break;
-            }
-            return text;
-        }
     }
     /// <summary>
     /// 鍔熻兘灞炴�ч敭鍚嶅垪琛�
     /// </summary>
     public static class FunctionAttributeKey
     {
+        public const string _null = "";
         /// <summary>
         /// 寮�鍏�
         /// </summary>
@@ -750,19 +707,55 @@
         /// <summary>
         /// 棰滆壊
         /// </summary>
-        public const string Color = "color";
+        public const string RGB = "rgb";
+        /// <summary>
+        /// 娓愬彉鏃堕棿
+        /// </summary>
+        public const string FadeTime = "fade_time";
         /// <summary>
         /// 妯″紡
         /// </summary>
         public const string Mode = "mode";
         /// <summary>
+        /// 鎵
+        /// </summary>
+        public const string Swing = "swing";
+        /// <summary>
+        /// 宸ヤ綔妯″紡
+        /// 鍦扮儹/鍦板喎/鍔熺巼鍦扮儹/鍔熺巼鍦板喎
+        /// </summary>
+        public const string WorkMode = "mode_work";
+        /// <summary>
         /// 椋庨��
         /// </summary>
         public const string FanSpeed = "fan";
         /// <summary>
-        /// 娓╁害
+        /// 鎵嬪姩椋庡悜
         /// </summary>
-        public const string Temp = "temperature";
+        public const string FanManual = "fan_manual";
+        /// <summary>
+        /// 鑷姩椋庡悜
+        /// </summary>
+        public const string FanAuto = "fan_auto";
+
+        /// <summary>
+        /// 璁剧疆娓╁害
+        /// </summary>
+        public const string SetTemp = "set_temp";
+        /// <summary>
+        /// 娓╁害鍔犲噺
+        /// </summary>
+        public const string SetTempStep = "set_temp_step";
+        /// <summary>
+        /// 娓╁害妯″紡
+        /// 绌鸿皟銆佸湴鐑�//app鑷姞
+        /// </summary>
+        public const string TempType = "temperature_type";
+        /// <summary>
+        /// 鏃堕棿鏍囪
+        /// 鍦扮儹//app鑷姞
+        /// </summary>
+        public const string TimeFlag = "time_flag";
         /// <summary>
         /// 寤舵椂
         /// </summary>
@@ -775,6 +768,132 @@
         /// 鐧惧垎姣�
         /// </summary>
         public const string Percent = "percent";
+        /// <summary>
+        /// 瀹ゅ唴娓╁害
+        /// </summary>
+        public const string RoomTemp = "room_temp";
+        /// <summary>
+        /// value
+        /// </summary>
+        public const string Value = "value";
+        /// <summary>
+        /// 鐘舵��,浼犳劅鍣�
+        /// </summary>
+        public const string Status = "status";
+        /// <summary>
+        /// 姣背娉紶鎰熷櫒锛屽姩浣滅姸鎬�
+        /// </summary>
+        public const string ActionStatus = "action_state";
+        /// <summary>
+        /// 鐢甸噺鐘舵��
+        /// </summary>
+        public const string BatteryState = "battery_state";
+        /// <summary>
+        /// 鐑樺共
+        /// </summary>
+        public const string HotDry = "hot_dry";
+        /// <summary>
+        /// 椋庡共
+        /// </summary>
+        public const string WindDry = "wind_dry";
+        /// <summary>
+        /// 娑堟瘨
+        /// </summary>
+        public const string Disinfect = "disinfect";
+        /// <summary>
+        /// 涓婂崌涓嬮檷
+        /// </summary>
+        public const string Position = "position";
+        /// <summary>
+        /// 杩涘害
+        /// </summary>
+        public const string PositionPercent = "position_percent";
+        /// <summary>
+        /// 鐑樺共鏃堕棿
+        /// </summary>
+        public const string HotDryTime = "hot_dry_time";
+        /// <summary>
+        /// 鐑樺共鍓╀綑鏃堕棿
+        /// </summary>
+        public const string HotDryTimeLeft = "hot_dry_time_surplus";
+        /// <summary>
+        /// 椋庡共鏃堕棿
+        /// </summary>
+        public const string WindDryTime = "wind_dry_time";
+        /// <summary>
+        /// 椋庡共鍓╀綑鏃堕棿
+        /// </summary>
+        public const string WindDryTimeLeft = "wind_dry_time_surplus";
+        /// <summary>
+        /// 娑堟瘨鏃堕棿
+        /// </summary>
+        public const string DisinfectTime = "disinfect_time";
+        /// <summary>
+        /// 娑堟瘨鍓╀綑鏃堕棿
+        /// </summary>
+        public const string DisinfectTimeLeft = "disinfect_time_surplus";
+        /// <summary>
+        /// 璐熺瀛�
+        /// </summary>
+        public const string Anion = "anion";
+        /// <summary>
+        /// 璐熺瀛愭椂闂�
+        /// </summary>
+        public const string AnionTime = "anion_time";
+        /// <summary>
+        /// 璐熺瀛愬墿浣欐椂闂�
+        /// </summary>
+        public const string AnionTimeLeft = "anion_time_surplus";
+        /// <summary>
+        /// 鎵撳紑绛夌骇(椋庢墖)
+        /// </summary>
+        public const string OpenLevel = "openLevel";
+        /// <summary>
+        /// 绾㈠鎸夐敭
+        /// </summary>
+        public const string Key = "key";
+
+        /// <summary>
+        /// 鑺傝兘
+        /// </summary>
+        public const string Energy = "energy";
+        /// <summary>
+        /// 婀垮害
+        /// </summary>
+        public const string Humidity = "humidity";
+        /// <summary>
+        /// 瀹ゅ唴娓╁害
+        /// </summary>
+        public const string IndoorTemp = "indoor_temp";
+        /// <summary>
+        /// 瀹ゅ唴婀垮害
+        /// </summary>
+        public const string IndoorHumidity = "indoor_humidity";
+        /// <summary>
+        /// 杩囨护缃戝墿浣欓噺
+        /// </summary>
+        public const string FilterRemain = "filter_remain";
+        /// <summary>
+        /// 杩囨护缃戞槸鍚﹁秴鏃惰鍛�
+        /// </summary>
+        public const string FilterTimeout = "filter_timeout";
+
+        #region tuya
+        /// <summary>
+        /// 娑傞甫姘撮榾寮�鍚椂闂�
+        /// </summary>
+        public const string TuyaWaterTime = "countdown_1";
+        #endregion
+        /// <summary>
+        /// 鍔熺巼
+        /// </summary>
+        public const string Power = "power";
+        /// <summary>
+        /// 鎬荤數閲�
+        /// </summary>
+        public const string TotalElectricity = "total_electricity";
+
+
     }
     /// <summary>
     /// 璁惧鍔熻兘oid
@@ -811,11 +930,29 @@
                 return Convert.ToByte(addresses.Substring(2, 2), 16);
             }
         }
-        public byte loopId;
+        public byte LoopId
+        {
+            get
+            {
+                try
+                {
+                    return Convert.ToByte(loopId, 16);
+                }catch
+                {
+                    return 0;
+                }
+            }
+        }
+
+        public string loopId;
     }
 
     public static class SPK
     {
+       
+
+
+        #region 鐏厜
         /// <summary>
         /// 锛堝紑鍏崇伅锛�
         /// </summary>
@@ -836,6 +973,24 @@
         /// 锛圕CT鐏級
         /// </summary>
         public const string LightCCT = "light.cct";
+
+        /// <summary>
+        /// 鐏厜spk鍒楄〃
+        /// </summary>
+        /// <returns></returns>
+        public static List<string> LightSpkList()
+        {
+            var spkList = new List<string>();
+            spkList.Add(LightCCT);
+            spkList.Add(LightDimming);
+            spkList.Add(LightRGB);
+            spkList.Add(LightRGBW);
+            spkList.Add(LightSwitch);
+            return spkList;
+        }
+        #endregion
+
+        #region 绐楀笜
         /// <summary>
         /// 锛堝紑鍏崇獥甯橈級
         /// </summary>
@@ -852,41 +1007,203 @@
         /// 锛堝嵎甯橈級
         /// </summary>
         public const string CurtainRoller = "curtain.roller";
+
+        /// <summary>
+        /// 绐楀笜spk鍒楄〃
+        /// </summary>
+        /// <returns></returns>
+        public static List<string> CurtainSpkList()
+        {
+            var spkList = new List<string>();
+            spkList.Add(CurtainRoller);
+            spkList.Add(CurtainSwitch);
+            spkList.Add(CurtainShades);
+            spkList.Add(CurtainTrietex);
+            return spkList;
+        }
+        #endregion
+
+        #region 绌鸿皟
         /// <summary>
         /// 锛堢┖璋冿級
         /// </summary>
         public const string AcStandard = "ac.standard";
         /// <summary>
+        /// 锛堢孩澶栫┖璋冿級
+        /// </summary>
+        public const string AcIr= "ir.ac";
+
+        /// <summary>
+        /// 绌鸿皟spk鍒楄〃
+        /// </summary>
+        /// <returns></returns>
+        public static List<string> AcSpkList()
+        {
+            var spkList = new List<string>();
+            spkList.Add(AcStandard);
+            spkList.Add(AcIr);
+            return spkList;
+        }
+        #endregion
+
+        #region 鍦扮儹
+        /// <summary>
         /// 锛堝湴鐑級
         /// </summary>
         public const string FloorHeatStandard = "floorHeat.standard";
+
+        /// <summary>
+        /// 鍦扮儹spk鍒楄〃
+        /// </summary>
+        /// <returns></returns>
+        public static List<string> FhSpkList()
+        {
+            var spkList = new List<string>();
+            spkList.Add(FloorHeatStandard);
+            return spkList;
+        }
+        #endregion
+
+        #region 鏂伴
         /// <summary>
         /// 锛堟柊椋庯級
         /// </summary>
         public const string AirFreshStandard = "airFresh.standard";
         /// <summary>
+        /// 鏂伴 鈥斺�旈噾鑼傚畾鍒�
+        /// </summary>
+        public const string AirFreshJinmao = "airFresh.jinmao";
+
+        /// <summary>
+        /// 鏂伴spk鍒楄〃
+        /// </summary>
+        /// <returns></returns>
+        public static List<string> AirFreshSpkList()
+        {
+            var spkList = new List<string>();
+            spkList.Add(AirFreshStandard);
+            spkList.Add(AirFreshJinmao);
+            return spkList;
+        }
+        #endregion
+
+        #region 鑳芥簮
+        /// <summary>
+        /// 鑳芥簮妯″潡
+        /// </summary>
+        public const string EnergyStandard = "energy.standard";
+
+        /// <summary>
+        /// 鑳芥簮-鐢佃兘
+        /// </summary>
+        public const string ElectricEnergy = "energy.electric";
+        /// <summary>
+        /// 鑳芥簮spk鍒楄〃
+        /// </summary>
+        /// <returns></returns>
+        public static List<string> EnergySpkList()
+        {
+            var spkList = new List<string>();
+            spkList.Add(ElectricEnergy);
+            return spkList;
+        }
+        #endregion
+
+        #region 闊充箰
+        /// <summary>
         /// 锛堥煶涔愶級
         /// </summary>
         public const string MusicStandard = "music.standard";
+
+        /// <summary>
+        /// 闊充箰spk鍒楄〃
+        /// </summary>
+        /// <returns></returns>
+        public static List<string> MusicSpkList()
+        {
+            var spkList = new List<string>();
+            spkList.Add(MusicStandard);
+            return spkList;
+        }
+        #endregion
+
+        #region 浼犳劅鍣�
+        #region 瀹夐槻浼犳劅鍣�
         /// <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>
+        /// </summary>
         public const string SensorDoorWindow = "sensor.doorwindow";
         /// <summary>
+        /// 鐑熼浘浼犳劅鍣�
+        /// </summary>
+        public const string SensorSmoke = "sensor.smoke";
+        /// <summary>
+        /// 姘存蹈浼犳劅鍣�
+        /// </summary>
+        public const string SensorWater = "sensor.water";
+        /// <summary>
+        /// 鐕冩皵浼犳劅鍣�
+        /// </summary>
+        public const string SensorGas = "sensor.gas";
+        /// <summary>
+        /// 绾㈠鐝婃爮浼犳劅鍣�      
+        /// </summary>
+        public const string SensorShanLan = "sensor.shanlan";
+        /// <summary>
+        /// 绾㈠瀵瑰皠浼犳劅鍣�
+        /// </summary>
+        public const string SensorDuiShe = "sensor.duishe";
+        /// <summary>
+        /// 瓒呭0娉紶鎰熷櫒
+        /// </summary>
+        public const string SensoruUtrasonic = "sensor.ultrasonic";
+        /// <summary>
+        /// 锛堝共鎺ョ偣锛�
+        /// </summary>
+        public const string SensorDryContact = "sensor.dryContact";
+        /// <summary>
+        /// 姣背娉紶鎰熷櫒
+        /// </summary>
+        public const string SenesorMegahealth = "sensor.megahealth";
+
+        /// <summary>
+        /// 瀹夐槻浼犳劅鍣╯pk鍒楄〃
+        /// </summary>
+        /// <returns></returns>
+        public static List<string> ArmSensorSpkList()
+        {
+            var spkList = new List<string>();
+            //spkList.Add(SensorLight);
+            spkList.Add(SensorPir);
+            spkList.Add(SensorDoorWindow);
+            spkList.Add(SensorSmoke);
+            spkList.Add(SensorWater);
+            //spkList.Add(SensorGas);
+            //spkList.Add(SensorShanLan);
+            //spkList.Add(SensorDuiShe);
+            //spkList.Add(SensoruUtrasonic);
+            //spkList.Add(SensorDryContact);
+            spkList.Add(SenesorMegahealth);
+            return spkList;
+        }
+        #endregion
+
+        #region 鐜浼犳劅鍣�
+        /// <summary>
+        /// 锛堟俯搴︿紶鎰熷櫒锛�
+        /// </summary>
+        public const string SensorTemperature = "sensor.temperature";
+        /// <summary>
         /// 锛圥M2.5浼犳劅鍣級
-        /// </summary>
+        /// </summary>
         public const string SensorPm25 = "sensor.pm25";
         /// <summary>
         /// co2浼犳劅鍣�
@@ -900,22 +1217,260 @@
         /// 婀垮害浼犳劅鍣�
         /// </summary>
         public const string SensorHumidity = "sensor.humidity";
+
         /// <summary>
-        /// 锛堝共鎺ョ偣锛�
-        /// </summary>
-        public const string DryContact = "dryContact.standard";
+        /// 鐜浼犳劅鍣╯pk鍒楄〃
+        /// </summary>
+        /// <returns></returns>
+        public static List<string> EnvironSpkList()
+        {
+            var spkList = new List<string>();
+            spkList.Add(SensorTemperature);
+            spkList.Add(SensorPm25);
+            spkList.Add(SensorCO2);
+            spkList.Add(SensorTVOC);
+            spkList.Add(SensorHumidity);
+            return spkList;
+        }
+        #endregion
+        #endregion
+
+        #region 瀹剁數
         /// <summary>
         /// 瀹剁數銆佹彃搴�
         /// </summary>
-        public const string ElectricSocket = "electric.socket ";
+        public const string ElectricSocket = "electrical.socket";
         /// <summary>
         /// 瀹剁數銆佺數瑙�
         /// </summary>
-        public const string ElectricTV = "electric.tv";
+        public const string ElectricTV = "electrical.tv";
+        /// <summary>
+        /// 绾㈠銆佺數瑙�
+        /// </summary>
+        public const string TvIr = "ir.tv";
+        /// <summary>
+        /// 绾㈠銆佸皬绫崇數瑙�
+        /// </summary>
+        public const string TvXmIr = "ir.tvxm";
         /// <summary>
         /// 瀹剁數銆侀鎵�
         /// </summary>
-        public const string ElectricFan = "electric.fan";
+        public const string ElectricFan = "electrical.fan";
+        /// <summary>
+        /// 鍑夐湼
+        /// </summary>
+        public const string ClothesHanger = "electrical.racks";
+        /// <summary>
+        /// 绾㈠閬ユ帶鍣�
+        /// </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>
+        /// 瀹剁數銆佹秱楦︾┖姘斿噣鍖栧櫒
+        /// </summary>
+        public const string ElectricTuyaAirCleaner = "electrical.Q1RsefNf91tIXyyQ";
+        /// <summary>
+        /// 瀹剁數銆佹秱楦︾數椋庢墖
+        /// </summary>
+        public const string ElectricTuyaFan = "electrical.tyqborgovyzytytz";
+        /// <summary>
+        /// 瀹剁數銆佹秱楦︽壂鍦版満鍣ㄤ汉
+        /// </summary>
+        public const string ElectricTuyaWeepRobot = "electrical.ai6HtccKFIw3dxo3";
+        /// <summary>
+        /// 瀹剁數銆佹秱楦︽按闃�
+        /// </summary>
+        public const string ElectricTuyaWaterValve = "electrical.koiGhMKwLf2ZP81g";
+        #endregion
+
+
+        /// <summary>
+        /// 瀹剁數spk鍒楄〃
+        /// </summary>
+        /// <returns></returns>
+        public static List<string> ElectricalSpkList()
+        {
+            var spkList = new List<string>();
+            spkList.Add(ElectricSocket);
+            spkList.Add(ElectricTV);
+            spkList.Add(TvIr);
+            spkList.Add(TvXmIr);
+            spkList.Add(ElectricFan);
+            spkList.Add(FanIr);
+            spkList.Add(ClothesHanger);
+            spkList.Add(IrLearn);
+            spkList.Add(PjtIr);
+            spkList.Add(StbIr);
+            spkList.Add(ElectricTuyaAirCleaner);
+            spkList.Add(ElectricTuyaFan);
+            spkList.Add(ElectricTuyaWeepRobot);
+            spkList.Add(ElectricTuyaWaterValve);
+            return spkList;
+        }
+
+
+        #endregion
+
+
+        #region 璁惧绫�
+        /// <summary>
+        /// 绾㈠瀹�
+        /// </summary>
+        public const string IrModule = "ir.module";
+
+        /// <summary>
+        /// 璁惧绫籹pk鍒楄〃
+        /// </summary>
+        /// <returns></returns>
+        public static List<string> DeviceSpkList()
+        {
+            var spkList = new List<string>();
+            spkList.Add(IrModule);
+            return spkList;
+        }
+        #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>
+        /// <returns></returns>
+        public static List<string> Get3tySpk(BrandType brandType)
+        {
+            var list = new List<string>();
+
+            switch (brandType)
+            {
+                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>
+        /// 绗笁鏂瑰搧鐗屽垪琛�
+        /// </summary>
+        public enum BrandType
+        {
+            All = 0,
+            Hdl = 1,
+            Tuya = 2,
+            /// <summary>
+            /// 鍏嗚
+            /// </summary>
+            Megahealth = 3,
+
+
+            All3tyBrand = 999,
+        }
+
+
     }
 
+
+    /// <summary>
+    /// 鍔熻兘绫诲埆
+    /// </summary>
+    public static class FunctionCategory
+    {
+        /// <summary>
+        ///锛堢伅锛�
+        /// </summary>
+        public const string Light = "light";
+        /// <summary>
+        /// 锛堢獥甯橈級
+        /// </summary>
+        public const string Curtain = "curtain";
+        /// <summary>
+        /// 锛堢┖璋冿級
+        /// </summary>
+        public const string AC = "ac";
+        /// <summary>
+        /// 锛堝湴鐑級
+        /// </summary>
+        public const string FloorHeat = "floorHeat";
+        /// <summary>
+        /// 锛堟柊椋庯級
+        /// </summary>
+        public const string AirFresh = "airFresh";
+        /// <summary>
+        /// 锛堥煶涔愶級
+        /// </summary>
+        public const string Music = "music";
+        /// <summary>
+        /// 锛堜紶鎰熷櫒锛�
+        /// </summary>
+        public const string Sensor = "sensor";
+        /// <summary>
+        /// 锛堝共鎺ョ偣锛�
+        /// </summary>
+        public const string DryContact = "dryContact";
+        /// <summary>
+        /// 瀹剁數
+        /// </summary>
+        public const string Electric = "electrical";
+        /// <summary>
+        /// 绾㈠璁惧
+        /// </summary>
+        public const string IR = "ir";
+
+
+
+
+    }
+
+
+public class VersionInfo
+{
+    public string module = "";
+    public string version = "";
+}
 }

--
Gitblit v1.8.0