From b8e94316e41eba72d927d5ca7d931b26139ee8ff Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期一, 15 六月 2020 09:12:53 +0800
Subject: [PATCH] 20200612
---
HDL_ON/UI/UI2/4-PersonalCenter/ResidentialManage/FloorsManagementPageBLL.cs | 22 ++++++++++++++--------
1 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/ResidentialManage/FloorsManagementPageBLL.cs b/HDL_ON/UI/UI2/4-PersonalCenter/ResidentialManage/FloorsManagementPageBLL.cs
index 79292f7..320f615 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/ResidentialManage/FloorsManagementPageBLL.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/ResidentialManage/FloorsManagementPageBLL.cs
@@ -1,4 +1,5 @@
锘縰sing System;
+using System.Collections.Generic;
using HDL_ON.Entity;
using Shared;
@@ -9,7 +10,7 @@
/// <summary>
/// 妤煎眰鎸夐挳淇敼鍚嶇О鐐瑰嚮浜嬩欢
/// </summary>
- void LoadEvent_FloorNamgeChange(Button btn,Button btnDel,RowLayout row)
+ void LoadEvent_FloorNamgeChange(Button btn,Button btnDel,RowLayout row,Floor floor)
{
btn.MouseUpEventHandler = (sender, e) =>
{
@@ -26,20 +27,26 @@
}.Show(bodyView);
return;
}
- if (DB_ResidenceData.residenceData.floors.Contains(newName))
+ if (DB_ResidenceData.residenceData.floors.Find((obj) => obj.name == newName) != null)
{
return;
}
else
{
- DB_ResidenceData.residenceData.floors[DB_ResidenceData.residenceData.floors.IndexOf(btn.Text)] = newName;
- //DB_ResidenceData.residenceData.SaveResidenceData();
+ floor.name = newName;
+ DB_ResidenceData.residenceData.SaveResidenceData();
btn.Text = newName;
btnDel.Tag = newName;
row.Tag = newName;
}
};
- new PublicAssmebly().LoadDialog_EditParater(StringId.EditFloorName, btn.Text, editCallBack,StringId.FloorNameCannotBeEmpty,StringId.EditFloorFailed_FloorAlreadyExist,DB_ResidenceData.residenceData.floors);
+ var floors = new List<string>();
+ foreach (var f in DB_ResidenceData.residenceData.floors)
+ {
+ floors.Add(f.name);
+ }
+ new PublicAssmebly().LoadDialog_EditParater(StringId.EditFloorName, btn.Text, editCallBack,StringId.FloorNameCannotBeEmpty,
+ StringId.EditFloorFailed_FloorAlreadyExist,floors);
};
}
@@ -75,7 +82,6 @@
{
Action action = () =>
{
- //string delFloor = DB_ResidenceData.residenceData.floors[(int)(sender as Button).Tag];
refreshFloorList("del", btn.Tag.ToString());
};
new PublicAssmebly().TipMsg(StringId.Tip, StringId.DelFloorTip, action);
@@ -93,8 +99,8 @@
{
return;
}
- room.floorIndex = DB_ResidenceData.residenceData.floors.IndexOf(lastButton.Text.Trim());
- room.floorIndex = DB_ResidenceData.residenceData.floors.IndexOf(lastButton.Text.Trim());
+ room.floorId = lastButton.Tag.ToString();
+ room.floorId = lastButton.Tag.ToString();
backAction?.Invoke();
bodyView.RemoveFromParent();
DB_ResidenceData.residenceData.SaveResidenceData();
--
Gitblit v1.8.0