From 37c315988c2dc11e4f477233f7a9f87d57bb61aa Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期一, 08 三月 2021 09:17:15 +0800
Subject: [PATCH] 数据结构优化修改

---
 HDL_ON/Entity/Function/Function.cs |   51 ++++++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 44 insertions(+), 7 deletions(-)

diff --git a/HDL_ON/Entity/Function/Function.cs b/HDL_ON/Entity/Function/Function.cs
index 2eca3c6..8bd7fe7 100644
--- a/HDL_ON/Entity/Function/Function.cs
+++ b/HDL_ON/Entity/Function/Function.cs
@@ -79,7 +79,7 @@
             return attrs;
         }
         /// <summary>
-        /// 鑾峰彇鍒跺畾灞炴��
+        /// 鑾峰彇鎸囧畾灞炴��
         /// </summary>
         /// <returns></returns>
         public FunctionAttributes GetAttribute(string key)
@@ -96,7 +96,7 @@
         public string GetAttrState(string key)
         {
             var attrState = attributes.Find((s) => s.key == key.ToString());
-            if(attrState == null)
+            if (attrState == null || string.IsNullOrEmpty(attrState.state))
             {
                 return "0";
             }
@@ -108,7 +108,7 @@
         /// <param name="key"></param>
         /// <param name="value"></param>
         /// <returns>淇敼缁撴灉</returns>
-        public bool SetAttrState(string key, string value)
+        public bool SetAttrState(string key, object value)
         {
             //var attrState = status.Find((s) => s.key == key.ToString());
             var attr = attributes.Find((s) => s.key == key);
@@ -118,13 +118,28 @@
             }
             else
             {
-                attr.state = value;
+                attr.state = value.ToString();
+                attr.curValue = value.ToString();
             }
             return true;
         }
 
 
 
+
+        /// <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
 
 
@@ -263,7 +278,6 @@
         public void CollectFunction()
         {
             var result = "";
-            //var waitPage = new Loading();
 
             new System.Threading.Thread(() =>
             {
@@ -282,6 +296,12 @@
                     {
                         collect = !collect;
                         IMessageCommon.Current.ShowErrorInfoAlter(result);
+                    });
+                }else
+                {
+                    Application.RunOnMainThread(() =>
+                    {
+                        UI.HomePage.RefreshFunctionView();
                     });
                 }
             })
@@ -672,6 +692,11 @@
         /// </summary>
         public const string Mode = "mode";
         /// <summary>
+        /// 宸ヤ綔妯″紡
+        /// 鍦扮儹/鍦板喎/鍔熺巼鍦扮儹/鍔熺巼鍦板喎
+        /// </summary>
+        public const string WorkMode = "mode_work";
+        /// <summary>
         /// 椋庨��
         /// </summary>
         public const string FanSpeed = "fan";
@@ -679,6 +704,16 @@
         /// 璁剧疆娓╁害
         /// </summary>
         public const string SetTemp = "set_temp";
+        /// <summary>
+        /// 娓╁害妯″紡
+        /// 绌鸿皟銆佸湴鐑�//app鑷姞
+        /// </summary>
+        public const string TempType = "temperature_type";
+        /// <summary>
+        /// 鏃堕棿鏍囪
+        /// 鍦扮儹//app鑷姞
+        /// </summary>
+        public const string TimeFlag = "time_flag";
         /// <summary>
         /// 寤舵椂
         /// </summary>
@@ -763,8 +798,10 @@
         /// 璐熺瀛愬墿浣欐椂闂�
         /// </summary>
         public const string AnionTimeLeft = "anion_time_surplus";
-
-
+        /// <summary>
+        /// 鎵撳紑鐧昏(椋庢墖)
+        /// </summary>
+        public const string OpenLevel = "openLevel";
 
 
         #region tuya

--
Gitblit v1.8.0