From eda3fb873e59544ff36301b51e05aef64f87b0f9 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 27 八月 2021 13:21:21 +0800
Subject: [PATCH] Merge branch 'newBranch1' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project into newBranch1
---
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