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 | 49 +++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 41 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 5c3657d..558cb68 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/FloorsManagementPageBLL.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/FloorsManagementPageBLL.cs
@@ -33,12 +33,41 @@
}
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 oldName = floor.roomName;
+ floor.roomName = newName;
+ var editResult = SpatialInfo.CurrentSpatial.UpdateFloor(floor);
+ Application.RunOnMainThread(() =>
+ {
+ if (editResult == DAL.Server.StateCode.SUCCESS)
+ {
+ btn.Text = newName;
+ }
+ else
+ {
+ floor.roomName = oldName;
+ }
+ });
+ }
+ catch { }
+ finally
+ {
+ Application.RunOnMainThread(() => {
+ if (waitPage != null)
+ {
+ waitPage.RemoveFromParent();
+ waitPage = null;
+ }
+ });
+ }
+ })
+ { IsBackground = true }.Start();
}
};
var floors = new List<string>();
@@ -61,13 +90,14 @@
Action action = () =>
{
//璇ユゼ灞傚垹闄や箣鍚庯紝缁戝畾璇ユゼ灞傜殑鎴块棿瑕侀噸缃粦瀹氱殑妤煎眰
- foreach (var r in DB_ResidenceData.residenceData.Rooms)
+ foreach (var r in SpatialInfo.CurrentSpatial.RoomList)
{
if (r.parentId == btn.Tag.ToString())
{
r.parentId = "";
}
}
+ SpatialInfo.CurrentSpatial.DelFloor(btn.Tag.ToString());
for (int i = 0; i < floorsListView.ChildrenCount; i++)
{
if (floorsListView.GetChildren(i).GetType() == typeof(RowLayout))
@@ -78,12 +108,15 @@
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().TipMsg(StringId.Tip, StringId.DelFloorTip, action);
+ new PublicAssmebly().TipOptionMsg(StringId.Tip, StringId.DelFloorTip, action);
};
}
}
--
Gitblit v1.8.0