From 86b4742e122bb3ff19f8b61574b4bbf8e5db4b11 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期六, 12 十二月 2020 19:35:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/CJL' into NewFilePath
---
HDL_ON/Entity/Function/Function.cs | 21 ++++++---------------
1 files changed, 6 insertions(+), 15 deletions(-)
diff --git a/HDL_ON/Entity/Function/Function.cs b/HDL_ON/Entity/Function/Function.cs
index 9376caf..4063399 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;
}
--
Gitblit v1.8.0