From 0f2e0147e8990e913d16d99bc1b94fb6bc53abd7 Mon Sep 17 00:00:00 2001 From: 陈嘉乐 <cjl@hdlchina.com.cn> Date: 星期四, 03 十二月 2020 15:35:42 +0800 Subject: [PATCH] 2020-12-03-1 --- HDL_ON/UI/UI0-Public/TopViewDivBLL.cs | 31 +++++++++++++++++-------------- 1 files changed, 17 insertions(+), 14 deletions(-) diff --git a/HDL_ON/UI/UI0-Public/TopViewDivBLL.cs b/HDL_ON/UI/UI0-Public/TopViewDivBLL.cs index c0fe33d..c2f6a6c 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,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 < DB_ResidenceData.residenceData.floors.Count + 1; ) { newFloorName = ++i + "F"; - if (null == DB_ResidenceData.residenceData.floors.Find((obj) => obj.name == newFloorName)) + 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) + 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); + 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