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

陈嘉乐

2021-01-11 1026814d931de92f0da5f15a58870565a94100e0

 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>();
@@ -68,6 +89,7 @@
                            r.parentId = "";
                        }
                    }
                    SpatialInfo.CurrentSpatial.DelFloor(btn.Tag.ToString());
                    for (int i = 0; i < floorsListView.ChildrenCount; i++)
                    {
                        if (floorsListView.GetChildren(i).GetType() == typeof(RowLayout))
@@ -78,9 +100,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);
                            }
                        }
                        SpatialInfo.CurrentSpatial.DelFloor(btn.Tag.ToString());
                    }
                };
                new PublicAssmebly().TipOptionMsg(StringId.Tip, StringId.DelFloorTip, action);