From 9b5399d3dd4299563821af0a7131f9a52402feea Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 11 九月 2020 17:42:19 +0800
Subject: [PATCH] 20209112
---
HDL_ON/UI/UI0-Public/TopViewDivBLL.cs | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/HDL_ON/UI/UI0-Public/TopViewDivBLL.cs b/HDL_ON/UI/UI0-Public/TopViewDivBLL.cs
index ea7c7f5..896d2d5 100644
--- a/HDL_ON/UI/UI0-Public/TopViewDivBLL.cs
+++ b/HDL_ON/UI/UI0-Public/TopViewDivBLL.cs
@@ -1,4 +1,5 @@
锘縰sing System;
+using System.Collections.Generic;
using HDL_ON.Entity;
namespace HDL_ON.UI
@@ -50,16 +51,22 @@
{
callBack("add", floorName);
};
- string newFloorName = "1 F";
+ string newFloorName = "1F";
for (int i = 0; i < DB_ResidenceData.residenceData.floors.Count + 1; )
{
- newFloorName = ++i + " F";
- if (!DB_ResidenceData.residenceData.floors.Contains(newFloorName))
+ newFloorName = ++i + "F";
+ if (null == DB_ResidenceData.residenceData.floors.Find((obj)=>obj.name == newFloorName))
{
break;
}
}
- new PublicAssmebly().LoadDialog_EditParater(StringId.AddFloors,newFloorName , callBackAction,StringId.FloorNameCannotBeEmpty,StringId.AddFloorFailed_FloorAlreadyExist,DB_ResidenceData.residenceData.floors);
+ var fs = new List<string>();
+ foreach(var f in DB_ResidenceData.residenceData.floors)
+ {
+ fs.Add(f.name);
+ }
+ new PublicAssmebly().LoadDialog_EditParater(StringId.AddFloors,newFloorName , callBackAction,StringId.FloorNameCannotBeEmpty,
+ StringId.AddFloorFailed_FloorAlreadyExist,fs);
break;
case "rooms":
callBack("", "");
--
Gitblit v1.8.0