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 | 32 ++++++++++++--------------------
1 files changed, 12 insertions(+), 20 deletions(-)
diff --git a/HDL_ON/UI/UI0-Public/TopViewDivBLL.cs b/HDL_ON/UI/UI0-Public/TopViewDivBLL.cs
index 0254719..c2f6a6c 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,11 +43,11 @@
{
callBack("add", floorName);
};
- string newFloorName = "1 F";
+ 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))
+ newFloorName = ++i + "F";
+ if (null == DB_ResidenceData.residenceData.floors.Find((obj)=>obj.name == newFloorName))
{
break;
}
--
Gitblit v1.8.0