From 774baeb1f5d2d49bfd692b79faa240bd7949dc17 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期四, 02 九月 2021 10:06:48 +0800
Subject: [PATCH] 2021-09-02 1.更新控件库,iOS裁剪支持指定大小或者不压缩。2.更新linphoneiOS和Android库,监视关闭麦克风。3.Android丰林和乐橙截图后增加广播推送系统相册刷新。

---
 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