From 7167334c0e89dd84827d59e726123d14776e3a09 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期二, 16 六月 2020 11:14:13 +0800
Subject: [PATCH] 2020-06-16-1
---
HDL_ON/UI/UI2/4-PersonalCenter/ResidentialManage/FloorsManagementPageBLL.cs | 47 +++++++++++++++++++++++++++++++++++------------
1 files changed, 35 insertions(+), 12 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/ResidentialManage/FloorsManagementPageBLL.cs b/HDL_ON/UI/UI2/4-PersonalCenter/ResidentialManage/FloorsManagementPageBLL.cs
index 211ca05..a73ca25 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/ResidentialManage/FloorsManagementPageBLL.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/ResidentialManage/FloorsManagementPageBLL.cs
@@ -9,24 +9,37 @@
/// <summary>
/// 妤煎眰鎸夐挳淇敼鍚嶇О鐐瑰嚮浜嬩欢
/// </summary>
- void LoadEvent_FloorNamgeChange(string floor,Button btn)
+ void LoadEvent_FloorNamgeChange(Button btn,Button btnDel,RowLayout row)
{
btn.MouseUpEventHandler = (sender, e) =>
{
Action<string> editCallBack = (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.Contains(newName))
{
return;
}
else
{
- DB_ResidenceData.residenceData.floors.Add(newName);
- DB_ResidenceData.residenceData.SaveResidenceData();
+ DB_ResidenceData.residenceData.floors[DB_ResidenceData.residenceData.floors.IndexOf(btn.Text)] = newName;
+ //DB_ResidenceData.residenceData.SaveResidenceData();
btn.Text = newName;
+ btnDel.Tag = newName;
+ row.Tag = newName;
}
};
- new PublicAssmebly().LoadDialog_EditParater(StringId.EditFloorName, floor, editCallBack);
+ // new PublicAssmebly().LoadDialog_EditParater(StringId.EditFloorName, btn.Text, editCallBack);
};
}
@@ -38,13 +51,17 @@
void LoadEvent_FloorChoose(Button btn)
{
btn.MouseUpEventHandler = (sender, e) => {
- btn.IsSelected = true;
- btn.IsBold = true;
if (lastButton != null)
{
lastButton.IsSelected = false;
- btn.IsBold = false;
+ if (lastButton.Text == btn.Text)
+ {
+ lastButton = null;
+ }
+ //btn.IsBold = false;
}
+ btn.IsSelected = true;
+ //btn.IsBold = true;
lastButton = btn;
};
}
@@ -58,10 +75,8 @@
{
Action action = () =>
{
- string delFloor = (sender as Button).Tag.ToString();
- DB_ResidenceData.residenceData.floors.Remove(delFloor);
- DB_ResidenceData.residenceData.SaveResidenceData();
- topCallBcak("del", delFloor);
+ //string delFloor = DB_ResidenceData.residenceData.floors[(int)(sender as Button).Tag];
+ refreshFloorList("del", btn.Tag.ToString());
};
new PublicAssmebly().TipMsg(StringId.Tip, StringId.DelFloorTip, action);
};
@@ -72,9 +87,17 @@
/// </summary>
void LoadEvent_BindFloor()
{
- btnConfrim.MouseUpEventHandler = (sender, e) => {
+ btnConfrim.MouseUpEventHandler = (sender, e) =>
+ {
+ if (lastButton == null)
+ {
+ return;
+ }
room.floorIndex = DB_ResidenceData.residenceData.floors.IndexOf(lastButton.Text.Trim());
+ room.floorIndex = DB_ResidenceData.residenceData.floors.IndexOf(lastButton.Text.Trim());
+ backAction?.Invoke();
bodyView.RemoveFromParent();
+ DB_ResidenceData.residenceData.SaveResidenceData();
};
}
--
Gitblit v1.8.0