From bb6ad792b598927a5459a5fb6f6c27fb1aa9e94e Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期四, 17 十二月 2020 14:06:36 +0800
Subject: [PATCH] 20201217-1
---
HDL_ON/UI/UI0-Public/TopViewDivBLL.cs | 23 +++++++++++++----------
1 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/HDL_ON/UI/UI0-Public/TopViewDivBLL.cs b/HDL_ON/UI/UI0-Public/TopViewDivBLL.cs
index bc222ab..4620b7a 100644
--- a/HDL_ON/UI/UI0-Public/TopViewDivBLL.cs
+++ b/HDL_ON/UI/UI0-Public/TopViewDivBLL.cs
@@ -15,13 +15,16 @@
{
btnBack.MouseUpEventHandler = (sender, e) => {
backAction?.Invoke();
- if (baseView != null)
+ if (needClose)
{
- baseView.RemoveFromParent();
- }
- if (baseDialog != null)
- {
- baseDialog.Close();
+ if (baseView != null)
+ {
+ baseView.RemoveFromParent();
+ }
+ if (baseDialog != null)
+ {
+ baseDialog.Close();
+ }
}
};
}
@@ -41,18 +44,18 @@
callBack("add", floorName);
};
string newFloorName = "1F";
- for (int i = 0; i < DB_ResidenceData.residenceData.floors.Count + 1; )
+ for (int i = 0; i < SpatialInfo.CurrentSpatial.FloorList.Count + 1; )
{
newFloorName = ++i + "F";
- if (null == DB_ResidenceData.residenceData.floors.Find((obj)=>obj.name == newFloorName))
+ if (null == SpatialInfo.CurrentSpatial.FloorList.Find((obj)=>obj.roomName == newFloorName))
{
break;
}
}
var fs = new List<string>();
- foreach(var f in DB_ResidenceData.residenceData.floors)
+ foreach(var f in SpatialInfo.CurrentSpatial.FloorList)
{
- fs.Add(f.name);
+ fs.Add(f.roomName);
}
new PublicAssmebly().LoadDialog_EditParater(StringId.AddFloors,newFloorName , callBackAction,StringId.FloorNameCannotBeEmpty,
StringId.AddFloorFailed_FloorAlreadyExist,fs);
--
Gitblit v1.8.0