From 611786df5108dca0bdcff03834cc285cba4b8e61 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期二, 13 十月 2020 16:48:43 +0800
Subject: [PATCH] 2020-10-13-1
---
HDL_ON/UI/UI2/4-PersonalCenter/ResidentialManage/FloorsManagementPageBLL.cs | 46 ++++++++++++++++++++++++++++++----------------
1 files changed, 30 insertions(+), 16 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/ResidentialManage/FloorsManagementPageBLL.cs b/HDL_ON/UI/UI2/4-PersonalCenter/ResidentialManage/FloorsManagementPageBLL.cs
index 9a1b589..7e191c6 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,29 +10,47 @@
/// <summary>
/// 妤煎眰鎸夐挳淇敼鍚嶇О鐐瑰嚮浜嬩欢
/// </summary>
- void LoadEvent_FloorNamgeChange(string floor,Button btn)
+ void LoadEvent_FloorNamgeChange(Button btn,Button btnDel,RowLayout row,Floor floor)
{
btn.MouseUpEventHandler = (sender, e) =>
{
Action<string> editCallBack = (newName) =>
{
- if (DB_ResidenceData.residenceData.floors.Contains(newName))
+ //妤煎眰鍚嶇О涓嶈兘涓虹┖
+ if (string.IsNullOrEmpty(newName))
+ {
+ new Tip()
+ {
+ CloseTime = 3,
+ Text = Language.StringByID(StringId.FloorNameCannotBeEmpty),
+ Direction = AMPopTipDirection.None,
+ }.Show(bodyView);
+ return;
+ }
+ if (DB_ResidenceData.residenceData.floors.Find((obj) => obj.name == newName) != null)
{
return;
}
else
{
- DB_ResidenceData.residenceData.floors.Add(newName);
+ floor.name = newName;
DB_ResidenceData.residenceData.SaveResidenceData();
btn.Text = newName;
+ btnDel.Tag = newName;
+ row.Tag = newName;
}
};
- new PublicAssmebly().LoadDialog_EditParater(StringId.EditFloorName, floor, editCallBack);
+ 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);
};
}
- Button lastButton;
/// <summary>
/// 鎴块棿缁戝畾妤煎眰锛屾ゼ灞傞�変腑浜嬩欢
/// </summary>
@@ -62,10 +81,7 @@
{
Action action = () =>
{
- string delFloor = (sender as Button).Tag.ToString();
- DB_ResidenceData.residenceData.floors.Remove(delFloor);
- DB_ResidenceData.residenceData.SaveResidenceData();
- topCallBack("del", delFloor);
+ refreshFloorList("del", btn.Tag.ToString());
};
new PublicAssmebly().TipMsg(StringId.Tip, StringId.DelFloorTip, action);
};
@@ -78,15 +94,13 @@
{
btnConfrim.MouseUpEventHandler = (sender, e) =>
{
- if (lastButton != null)
+ if (lastButton == null)
{
- room.floorIndex = DB_ResidenceData.residenceData.floors.IndexOf(lastButton.Text.Trim());
+ return;
}
- room.floorIndex = DB_ResidenceData.residenceData.floors.IndexOf(lastButton.Text.Trim());
- if (backAction != null)
- {
- backAction();
- }
+ room.floorId = lastButton.Tag.ToString();
+ room.floorId = lastButton.Tag.ToString();
+ backAction?.Invoke();
bodyView.RemoveFromParent();
DB_ResidenceData.residenceData.SaveResidenceData();
};
--
Gitblit v1.8.0