From 3cce7810ca728954faf7666ffa2f87160f86b3b3 Mon Sep 17 00:00:00 2001 From: JLChen <551775569@qq.com> Date: 星期三, 16 十二月 2020 18:45:12 +0800 Subject: [PATCH] 2020-12-16 1.增加推送注册状态隐藏功能提示。2.解锁设置UI还原优化调整。 --- HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/AddRoom/AddRoomPage.cs | 19 +++++++++++-------- 1 files changed, 11 insertions(+), 8 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 b5bc984..e57df22 100644 --- a/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/AddRoom/AddRoomPage.cs +++ b/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/AddRoom/AddRoomPage.cs @@ -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>(); @@ -453,14 +453,17 @@ { deviceIds.Add(f.deviceId); } - var bindResult = FunctionList.List.FunctionsBindRooms(new List<string>() { room.roomId }, deviceIds); - if (bindResult == StateCode.SUCCESS) + if (deviceIds.Count > 0) { - room.GetRoomFunctions(true); - } - else - { - //Utlis.ShowTip(Language.StringByID(StringId.EditFunctionInfoFail) + "\r\nCode:" + pack.Code); + 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); + } } backAction(room); RemoveFromParent(); -- Gitblit v1.8.0