From 01c46e7bfe9aa8fb20b29f70c83c03a307af548a Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期二, 22 十二月 2020 16:35:16 +0800
Subject: [PATCH] 2020-12-22 1.更新。
---
HDL_ON/UI/UI0-Public/TopViewDivBLL.cs | 33 ++++++++++++++++++---------------
1 files changed, 18 insertions(+), 15 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 c0fe33d..4620b7a
--- 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();
+ }
}
};
}
@@ -31,7 +34,7 @@
/// 椤堕儴娣诲姞鎸夐挳鐐瑰嚮浜嬩欢
/// </summary>
/// <param name="type">娣诲姞鎸夐挳鐨勫姛鑳界被鍨�</param>
- void LoadEvent_AddEvent(string type, Action<string, string> callBack)
+ void LoadEvent_AddEvent(string type,Action <string,string> callBack)
{
switch (type)
{
@@ -41,29 +44,29 @@
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);
+ new PublicAssmebly().LoadDialog_EditParater(StringId.AddFloors,newFloorName , callBackAction,StringId.FloorNameCannotBeEmpty,
+ StringId.AddFloorFailed_FloorAlreadyExist,fs);
break;
case "rooms":
callBack("", "");
break;
case "Member":
- callBack("", "");
+ callBack("","");
break;
-
+
}
}
--
Gitblit v1.8.0