From 9c8baf7e7e1169ebdf7d5f7ed33ab29dd5fcbf18 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期一, 14 十二月 2020 17:45:17 +0800
Subject: [PATCH] 2020-12-14 1.解锁设置问题修复，增加面容ID验证。2.错误码对接增加。
---
HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/AddRoom/AddRoomPage.cs | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/AddRoom/AddRoomPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/AddRoom/AddRoomPage.cs
index cc83b2f..cc90c39 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/AddRoom/AddRoomPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/AddRoom/AddRoomPage.cs
@@ -437,7 +437,7 @@
}.Show(bodyView);
return;
}
- foreach (var tempRoom in DB_ResidenceData.residenceData.Rooms)
+ foreach (var tempRoom in SpatialInfo.CurrentSpatial.RoomList)
{
if (room.roomName == tempRoom.roomName)
{
@@ -445,7 +445,7 @@
return;
}
}
- var addResult = SpatialInfo.CurrentSpatial.AddRoom(room);//妫�鏌oom鏄惁涓轰簯绔繑鍥炵殑鏈�鏂版暟鎹�
+ var addResult = SpatialInfo.CurrentSpatial.AddRoom(room,out room);//妫�鏌oom鏄惁涓轰簯绔繑鍥炵殑鏈�鏂版暟鎹�
if (addResult == StateCode.SUCCESS)
{
var deviceIds = new List<string>();
@@ -456,6 +456,10 @@
var bindResult = FunctionList.List.FunctionsBindRooms(new List<string>() { room.roomId }, deviceIds);
if (bindResult == StateCode.SUCCESS)
{
+ foreach(var f in roomFunctions)
+ {
+ f.roomIds.Add(room.roomId);
+ }
room.GetRoomFunctions(true);
}
else
@@ -503,7 +507,7 @@
EventHandler<MouseEventArgs> eventHandler = (sender, e) =>
{
List<string> roomNameList = new List<string>();
- foreach (var temp in DB_ResidenceData.residenceData.Rooms)
+ foreach (var temp in SpatialInfo.CurrentSpatial.RoomList)
{
roomNameList.Add(temp.roomName);
}
--
Gitblit v1.8.0