From e172a0f48fdd01733e04bda2370846b9f36b840f Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期五, 15 十月 2021 14:44:03 +0800
Subject: [PATCH] 2021-10-15 1.修改乐橙推送字段,psk参数取值不能取cname和deviceName

---
 HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/FloorsManagementPageBLL.cs |   14 +++++++++++---
 1 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/FloorsManagementPageBLL.cs b/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/FloorsManagementPageBLL.cs
index de7355a..558cb68 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/FloorsManagementPageBLL.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/FloorsManagementPageBLL.cs
@@ -40,13 +40,18 @@
                         {
                             try
                             {
+                                var oldName = floor.roomName;
+                                floor.roomName = newName;
                                 var editResult = SpatialInfo.CurrentSpatial.UpdateFloor(floor);
                                 Application.RunOnMainThread(() =>
                                 {
                                     if (editResult == DAL.Server.StateCode.SUCCESS)
                                     {
-                                        floor.roomName = newName;
                                         btn.Text = newName;
+                                    }
+                                    else
+                                    {
+                                        floor.roomName = oldName;
                                     }
                                 });
                             }
@@ -54,8 +59,11 @@
                             finally
                             {
                                 Application.RunOnMainThread(() => {
-                                    waitPage.Hide();
-                                    waitPage.RemoveFromParent();
+                                    if (waitPage != null)
+                                    {
+                                        waitPage.RemoveFromParent();
+                                        waitPage = null;
+                                    }
                                 });
                             }
                         })

--
Gitblit v1.8.0