From b7638936d350eb1f48c02895b9275c79587726ce Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期二, 15 十二月 2020 17:18:48 +0800
Subject: [PATCH] 2020-12-15-3

---
 HDL_ON/Entity/Function/Function.cs |   31 +++++++++++++------------------
 1 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/HDL_ON/Entity/Function/Function.cs b/HDL_ON/Entity/Function/Function.cs
index 9376caf..578e86f 100644
--- a/HDL_ON/Entity/Function/Function.cs
+++ b/HDL_ON/Entity/Function/Function.cs
@@ -114,15 +114,6 @@
         /// 璇ュ姛鑳芥坊鍔犲埌鍒版埧闂村垪琛�
         /// </summary>
         public List<string> roomIds = new List<string>();
-        /// <summary>
-        /// 缁戝畾鎴块棿
-        /// </summary>
-        public void BindRoom(string roomId)
-        {
-            roomIds.Add(roomId);
-            var pm = new DAL.Server.HttpServerRequest();
-            pm.BindDeviceToRoom(deviceId, roomId);
-        }
 
         /// <summary>
         /// bus鍗忚鏁版嵁鏍煎紡
@@ -261,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;
@@ -301,21 +292,20 @@
                 if (pack.Code == DAL.Server.StateCode.SUCCESS)
                 {
                     var ssd = System.Text.Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(this));
-                    FileUtils.WriteFileByBytes(savePath, ssd);
-                    MainPage.Log($"Save FunctionData {this.functionType} : {this.sid}");
+                    Common.FileUtlis.Files.WriteFileByBytes(savePath, ssd);
                 }
                 else
                 {
-                    Utlis.ShowTip(Language.StringByID(StringId.EditFunctionInfoFail) + "Code:" + pack.Code);
+                    Utlis.ShowTip(Language.StringByID(StringId.EditFunctionInfoFail) + "\r\nCode:" + pack.Code);
                 }
             }
             else
             {
                 var ssd = System.Text.Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(this));
-                FileUtils.WriteFileByBytes(savePath, ssd);
-                MainPage.Log($"Save FunctionData {this.functionType} : {this.sid}");
+                Common.FileUtlis.Files.WriteFileByBytes(savePath, ssd);
             }
         }
+      
 
         /// <summary>
         /// 杞崲鎴愬満鏅姛鑳藉璞�
@@ -327,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;
         }
@@ -496,7 +487,7 @@
                 switch (key)
                 {
                     case "temperature":
-                    case "set_temperature":
+                    case "set_temp":
                         us = "掳C";
                         break;
                     case "percent":
@@ -536,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":
@@ -599,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 == "")
@@ -784,6 +775,10 @@
         /// 鐧惧垎姣�
         /// </summary>
         public const string Percent = "percent";
+        /// <summary>
+        /// 瀹ゅ唴娓╁害
+        /// </summary>
+        public const string IndoorTemp = "room_temp";
     }
     /// <summary>
     /// 璁惧鍔熻兘oid

--
Gitblit v1.8.0