From d814c978efc068425c500a553cf7ec6b4f628219 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期三, 23 十二月 2020 22:27:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/CJL' into NewFilePath

---
 HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/FloorsManagementPageBLL.cs |   39 ++++++++++++++++++++++++++++++++-------
 1 files changed, 32 insertions(+), 7 deletions(-)

diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/FloorsManagementPageBLL.cs b/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/FloorsManagementPageBLL.cs
index 92407d9..354dc82 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/FloorsManagementPageBLL.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/FloorsManagementPageBLL.cs
@@ -33,12 +33,33 @@
                     }
                     else
                     {
-                        var editResult = SpatialInfo.CurrentSpatial.UpdateFloor(floor);
-                        if (editResult == DAL.Server.StateCode.SUCCESS)
+                        var waitPage = new Loading();
+                        MainPage.BaseView.AddChidren(waitPage);
+                        waitPage.Start(Language.StringByID(StringId.PleaseWait));
+                        new System.Threading.Thread(() =>
                         {
-                            floor.roomName = newName;
-                            btn.Text = newName;
-                        }
+                            try
+                            {
+                                var editResult = SpatialInfo.CurrentSpatial.UpdateFloor(floor);
+                                Application.RunOnMainThread(() =>
+                                {
+                                    if (editResult == DAL.Server.StateCode.SUCCESS)
+                                    {
+                                        floor.roomName = newName;
+                                        btn.Text = newName;
+                                    }
+                                });
+                            }
+                            catch { }
+                            finally
+                            {
+                                Application.RunOnMainThread(() => {
+                                    waitPage.Hide();
+                                    waitPage.RemoveFromParent();
+                                });
+                            }
+                        })
+                        { IsBackground = true }.Start();
                     }
                 };
                 var floors = new List<string>();
@@ -80,10 +101,14 @@
                                 row.RemoveFromParent();
                             }
                         }
-                        SpatialInfo.CurrentSpatial.DelFloor(btn.Tag.ToString());
+                        new System.Threading.Thread(() =>
+                        {
+                            SpatialInfo.CurrentSpatial.DelFloor(btn.Tag.ToString());
+                        })
+                        { IsBackground = true }.Start();
                     }
                 };
-                new PublicAssmebly().TipMsg(StringId.Tip, StringId.DelFloorTip, action);
+                new PublicAssmebly().TipOptionMsg(StringId.Tip, StringId.DelFloorTip, action);
             };
         }
     }

--
Gitblit v1.8.0