From 06696e6f225733a60b03eea4a7c6374053d92c1d Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 14 四月 2020 14:15:35 +0800
Subject: [PATCH] 20200414
---
HDL_ON/UI/UI0-Public/TopViewDivBLL.cs | 27 ++++++++++++---------------
1 files changed, 12 insertions(+), 15 deletions(-)
diff --git a/HDL_ON/UI/UI0-Public/TopViewDivBLL.cs b/HDL_ON/UI/UI0-Public/TopViewDivBLL.cs
index 9ded327..85f6394 100644
--- a/HDL_ON/UI/UI0-Public/TopViewDivBLL.cs
+++ b/HDL_ON/UI/UI0-Public/TopViewDivBLL.cs
@@ -13,10 +13,7 @@
void LoadEvent_BackEvent()
{
btnBack.MouseUpEventHandler = (sender, e) => {
- if (backAction != null)
- {
- backAction();
- }
+ backAction?.Invoke();
if (baseView != null)
{
baseView.RemoveFromParent();
@@ -51,18 +48,18 @@
case "floors":
Action<string> callBackAction = (floorName) =>
{
- if (DB_ResidenceData.residenceData.floors.Contains(floorName))
- {
- return;
- }
- else
- {
- DB_ResidenceData.residenceData.floors.Add(floorName);
- DB_ResidenceData.residenceData.SaveResidenceData();
- callBack("add", floorName);
- }
+ callBack("add", floorName);
};
- new PublicAssmebly().LoadDialog_EditParater(StringId.AddFloors, DB_ResidenceData.residenceData.floors.Count + 1 + " F", callBackAction);
+ string newFloorName = "1 F";
+ for (int i = 0; i < DB_ResidenceData.residenceData.floors.Count ; i++)
+ {
+ newFloorName = ++i + " F";
+ if (!DB_ResidenceData.residenceData.floors.Contains(newFloorName))
+ {
+ break;
+ }
+ }
+ new PublicAssmebly().LoadDialog_EditParater(StringId.AddFloors,newFloorName , callBackAction);
break;
case "rooms":
callBack("", "");
--
Gitblit v1.8.0