From a4f57bf9dda3d52e04f537a2ca24db95761eb888 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 11 十二月 2020 11:34:14 +0800
Subject: [PATCH] Revert "Merge branch 'CJL-NEW' into NewFilePath"
---
HDL_ON/Entity/Function/Function.cs | 16 +++-------------
1 files changed, 3 insertions(+), 13 deletions(-)
diff --git a/HDL_ON/Entity/Function/Function.cs b/HDL_ON/Entity/Function/Function.cs
index 9376caf..7559473 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 = DB_ResidenceData.residenceData.Rooms.Find(obj => obj.roomId == roomId);
if (findRoom == null)
{
continue;
@@ -302,20 +293,19 @@
{
var ssd = System.Text.Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(this));
FileUtils.WriteFileByBytes(savePath, ssd);
- MainPage.Log($"Save FunctionData {this.functionType} : {this.sid}");
}
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}");
}
}
+
/// <summary>
/// 杞崲鎴愬満鏅姛鑳藉璞�
--
Gitblit v1.8.0