Merge remote-tracking branch 'origin/CJL' into NewFilePath

wei

2020-12-23 d814c978efc068425c500a553cf7ec6b4f628219

 HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/FloorsManagementPageBLL.cs

old mode 100755
new mode 100644
@@ -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,7 +101,11 @@
                                row.RemoveFromParent();
                            }
                        }
                        SpatialInfo.CurrentSpatial.DelFloor(btn.Tag.ToString());
                        new System.Threading.Thread(() =>
                        {
                            SpatialInfo.CurrentSpatial.DelFloor(btn.Tag.ToString());
                        })
                        { IsBackground = true }.Start();
                    }
                };
                new PublicAssmebly().TipOptionMsg(StringId.Tip, StringId.DelFloorTip, action);