From 98d002e55304e5c8ff13b7cd195920975bef69f5 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 23 二月 2021 17:16:57 +0800
Subject: [PATCH] Merge branch 'CJL' into temp-wxr
---
HDL_ON/UI/UI0-Public/TopViewDivBLL.cs | 38 +++++++++++++++-----------------------
1 files changed, 15 insertions(+), 23 deletions(-)
diff --git a/HDL_ON/UI/UI0-Public/TopViewDivBLL.cs b/HDL_ON/UI/UI0-Public/TopViewDivBLL.cs
index 51787f4..4620b7a 100644
--- a/HDL_ON/UI/UI0-Public/TopViewDivBLL.cs
+++ b/HDL_ON/UI/UI0-Public/TopViewDivBLL.cs
@@ -15,28 +15,20 @@
{
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();
+ }
}
};
}
- /// <summary>
- /// 椤堕儴鎸夐挳璺宠浆鍔熻兘閰嶇疆椤甸潰
- /// </summary>
- /// <param name="function"></param>
- void LoadEvent_SkipFunctionSetting(Function function)
- {
- var infoView = new FunctionBaseInfoSetPage(function,backAction);
- MainPage.BasePageView.AddChidren(infoView);
- infoView.LoadPage();
- MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
- }
/// <summary>
/// 椤堕儴娣诲姞鎸夐挳鐐瑰嚮浜嬩欢
@@ -51,19 +43,19 @@
{
callBack("add", floorName);
};
- string newFloorName = "1 F";
- for (int i = 0; i < DB_ResidenceData.residenceData.floors.Count + 1; )
+ string newFloorName = "1F";
+ for (int i = 0; i < SpatialInfo.CurrentSpatial.FloorList.Count + 1; )
{
- newFloorName = ++i + " F";
- if (null == DB_ResidenceData.residenceData.floors.Find((obj)=>obj.name == newFloorName))
+ newFloorName = ++i + "F";
+ 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