From f4b178e64fd43262872fe9d443aa9da6048ceaac Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 20 十一月 2020 17:57:29 +0800
Subject: [PATCH] Merge branch 'CJL'
---
HDL_ON/UI/UI0-Public/TopViewDivBLL.cs | 31 ++++++++++---------------------
1 files changed, 10 insertions(+), 21 deletions(-)
diff --git a/HDL_ON/UI/UI0-Public/TopViewDivBLL.cs b/HDL_ON/UI/UI0-Public/TopViewDivBLL.cs
index 0254719..c0fe33d 100644
--- a/HDL_ON/UI/UI0-Public/TopViewDivBLL.cs
+++ b/HDL_ON/UI/UI0-Public/TopViewDivBLL.cs
@@ -26,23 +26,12 @@
};
}
- /// <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>
/// 椤堕儴娣诲姞鎸夐挳鐐瑰嚮浜嬩欢
/// </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)
{
@@ -51,30 +40,30 @@
{
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 < 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;
}
}
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