From 48c07e0a371f67b97abc7c2e61d7f23d060324fc Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 28 一月 2021 18:24:53 +0800
Subject: [PATCH] Merge branch 'dev-tzy' into NewFilePath
---
HDL_ON/UI/UI0-Public/TopViewDivBLL.cs | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/HDL_ON/UI/UI0-Public/TopViewDivBLL.cs b/HDL_ON/UI/UI0-Public/TopViewDivBLL.cs
old mode 100644
new mode 100755
index c2f6a6c..4620b7a
--- a/HDL_ON/UI/UI0-Public/TopViewDivBLL.cs
+++ b/HDL_ON/UI/UI0-Public/TopViewDivBLL.cs
@@ -44,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