From 09dfbfd9b77ec887c17b10f15799a1d3f56e4e17 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期二, 15 十二月 2020 12:04:42 +0800
Subject: [PATCH] 2020-12-15-1

---
 HDL_ON/Entity/Function/Function.cs |   52 ++++++++++++++++++++++++++++++++++++----------------
 1 files changed, 36 insertions(+), 16 deletions(-)

diff --git a/HDL_ON/Entity/Function/Function.cs b/HDL_ON/Entity/Function/Function.cs
index 2a722a1..578e86f 100644
--- a/HDL_ON/Entity/Function/Function.cs
+++ b/HDL_ON/Entity/Function/Function.cs
@@ -31,7 +31,6 @@
         {
         }
 
-
         #region base info
         /// <summary>
         /// HDL缁熶竴鍗忚鏍煎紡锛�14bytes
@@ -253,7 +252,7 @@
             string roomNameList = "";
             foreach (var roomId in roomIds)
             {
-                var findRoom = DB_ResidenceData.residenceData.Rooms.Find(obj => obj.uid == roomId);
+                var findRoom = SpatialInfo.CurrentSpatial.RoomList.Find(obj => obj.roomId == roomId);
                 if (findRoom == null)
                 {
                     continue;
@@ -284,12 +283,29 @@
         /// <summary>
         /// 淇濆瓨鍔熻兘鏁版嵁
         /// </summary>
-        public void SaveFunctionData()
+        public void SaveFunctionData(bool upSevser)
         {
-            var ssd = System.Text.Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(this));
-            FileUtils.WriteFileByBytes(savePath, ssd);
-            MainPage.Log($"Save FunctionData {this.functionType} : {this.sid}");
+            if (upSevser)
+            {
+                var pm = new DAL.Server.HttpServerRequest();
+                var pack = pm.UpdataDevcieInfo(this);
+                if (pack.Code == DAL.Server.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);
+                }
+            }
+            else
+            {
+                var ssd = System.Text.Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(this));
+                Common.FileUtlis.Files.WriteFileByBytes(savePath, ssd);
+            }
         }
+      
 
         /// <summary>
         /// 杞崲鎴愬満鏅姛鑳藉璞�
@@ -301,6 +317,7 @@
             foreach (var attr in attributes)
             {
                 sFunc.status.Add(new SceneFunctionStatus() { key = attr.key, value = attr.curValue.ToString() });
+                sFunc.sid = this.sid;
             }
             return sFunc;
         }
@@ -313,9 +330,9 @@
         /// <summary>
         /// 鑾峰彇鏈湴鎺у埗鏁版嵁
         /// </summary>
-        public GatewayAlinkControlObj GetGatewayAlinkControlData(Dictionary<string, string> commandDictionary)
+        public AlinkFunctionStatusObj GetGatewayAlinkControlData(Dictionary<string, string> commandDictionary)
         {
-            var sendDataObj = new GatewayAlinkControlObj();
+            var sendDataObj = new AlinkFunctionStatusObj();
             sendDataObj.id = Control.Ins.msg_id.ToString();
             sendDataObj.time_stamp = Control.Ins.Get_TimeStamp();
 
@@ -377,10 +394,9 @@
     }
 
     /// <summary>
-    /// 鏈湴鎺у埗
     /// A鍗忚鎺у埗鏁版嵁鐨勫璞�
     /// </summary>
-    public class GatewayAlinkControlObj
+    public class AlinkFunctionStatusObj
     {
         public List<AlinkControlData> objects = new List<AlinkControlData>();
 
@@ -391,7 +407,7 @@
     /// 鏈湴鐘舵�佽鍙�
     /// A鍗忚鐘舵�佽鍙栨牸寮忓璞�
     /// </summary>
-    public class GatewayAlinkReadObj
+    public class AlinkReadFunctionStatusObj
     {
         public string id = "0";
         public List<Dictionary<string, string>> objects = new List<Dictionary<string, string>>();
@@ -439,11 +455,11 @@
         /// <summary>
         /// 鏈�澶у��
         /// </summary>
-        public int max;
+        public int max=100;
         /// <summary>
         /// 鏈�灏忓��
         /// </summary>
-        public int min;
+        public int min=0;
         /// <summary>
         /// 鏁版嵁绫诲瀷
         /// </summary>
@@ -471,7 +487,7 @@
                 switch (key)
                 {
                     case "temperature":
-                    case "set_temperature":
+                    case "set_temp":
                         us = "掳C";
                         break;
                     case "percent":
@@ -511,7 +527,7 @@
                         text = Language.StringByID(StringId.FanSpeed);
                         break;
                     case "temperature":
-                case "set_temperature":
+                case "set_temp":
                         text = Language.StringByID(StringId.Temp);
                         break;
                     case "delay":
@@ -574,7 +590,7 @@
                     text = value == "on" ? Language.StringByID(StringId.On) : Language.StringByID(StringId.OFF);
                     break;
                 case "temperature":
-                case "set_temperature":
+                case "set_temp":
                 case "brightness":
                 case "percent":
                     if (value == "")
@@ -759,6 +775,10 @@
         /// 鐧惧垎姣�
         /// </summary>
         public const string Percent = "percent";
+        /// <summary>
+        /// 瀹ゅ唴娓╁害
+        /// </summary>
+        public const string IndoorTemp = "room_temp";
     }
     /// <summary>
     /// 璁惧鍔熻兘oid

--
Gitblit v1.8.0