From efad979b6fae76fb37a4de7e94e6bac0a85cb72c Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期二, 30 十一月 2021 13:14:28 +0800
Subject: [PATCH] 2021-11-30 1.修复乐橙Android,没调用拒接接口问题。

---
 HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/FloorsManagementPageBLL.cs |   24 ++++++++++++++++--------
 1 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/FloorsManagementPageBLL.cs b/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/FloorsManagementPageBLL.cs
index 354dc82..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;
+                                    }
                                 });
                             }
                         })
@@ -89,6 +97,7 @@
                             r.parentId = "";
                         }
                     }
+                    SpatialInfo.CurrentSpatial.DelFloor(btn.Tag.ToString());
                     for (int i = 0; i < floorsListView.ChildrenCount; i++)
                     {
                         if (floorsListView.GetChildren(i).GetType() == typeof(RowLayout))
@@ -99,13 +108,12 @@
                             if (row.Tag.ToString() == btn.Tag.ToString())
                             {
                                 row.RemoveFromParent();
+                                int count = SpatialInfo.CurrentSpatial.FloorList.Count > 8 ? 8 : SpatialInfo.CurrentSpatial.FloorList.Count;
+                                var contentViewHeight = (count + 1) * Application.GetRealHeight(50);
+                                contentView.Height = contentViewHeight;
+                                floorsListView.Height = count * Application.GetRealHeight(50);
                             }
                         }
-                        new System.Threading.Thread(() =>
-                        {
-                            SpatialInfo.CurrentSpatial.DelFloor(btn.Tag.ToString());
-                        })
-                        { IsBackground = true }.Start();
                     }
                 };
                 new PublicAssmebly().TipOptionMsg(StringId.Tip, StringId.DelFloorTip, action);

--
Gitblit v1.8.0