From a1b0ab7044100daaa7e0f1da2d2ca45e38098963 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期一, 29 三月 2021 09:13:25 +0800
Subject: [PATCH] 2021-3-29-2
---
HDL_ON/UI/UI0-Public/TopViewDivBLL.cs | 54 +++++++++++++++---------------------------------------
1 files changed, 15 insertions(+), 39 deletions(-)
diff --git a/HDL_ON/UI/UI0-Public/TopViewDivBLL.cs b/HDL_ON/UI/UI0-Public/TopViewDivBLL.cs
index c0fe33d..00106dd 100644
--- 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,40 +34,13 @@
/// 椤堕儴娣诲姞鎸夐挳鐐瑰嚮浜嬩欢
/// </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)
- {
- case "floors":
- Action<string> callBackAction = (floorName) =>
- {
- callBack("add", floorName);
- };
- string newFloorName = "1F";
- for (int i = 0; i < DB_ResidenceData.residenceData.floors.Count + 1;)
- {
- newFloorName = ++i + "F";
- if (null == DB_ResidenceData.residenceData.floors.Find((obj) => obj.name == newFloorName))
- {
- break;
- }
- }
- 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("", "");
- break;
- case "Member":
- callBack("", "");
- break;
-
- }
+ //switch (type)
+ //{
+
+
+ //}
}
}
--
Gitblit v1.8.0