From 06696e6f225733a60b03eea4a7c6374053d92c1d Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 14 四月 2020 14:15:35 +0800
Subject: [PATCH] 20200414

---
 HDL_ON/UI/UI2/4-PersonalCenter/ResidentialManage/FloorsManagementPageBLL.cs |   30 ++++++++++++++++++------------
 1 files changed, 18 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 9a1b589..984d62c 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/ResidentialManage/FloorsManagementPageBLL.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/ResidentialManage/FloorsManagementPageBLL.cs
@@ -9,24 +9,35 @@
         /// <summary>
         /// 妤煎眰鎸夐挳淇敼鍚嶇О鐐瑰嚮浜嬩欢
         /// </summary>
-        void LoadEvent_FloorNamgeChange(string floor,Button btn)
+        void LoadEvent_FloorNamgeChange(Button btn)
         {
             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;
                     }
                 };
-                new PublicAssmebly().LoadDialog_EditParater(StringId.EditFloorName, floor, editCallBack);
+                new PublicAssmebly().LoadDialog_EditParater(StringId.EditFloorName, btn.Text, editCallBack);
             };
         }
 
@@ -62,10 +73,8 @@
             {
                 Action action = () =>
                 {
-                    string delFloor = (sender as Button).Tag.ToString();
-                    DB_ResidenceData.residenceData.floors.Remove(delFloor);
-                    DB_ResidenceData.residenceData.SaveResidenceData();
-                    topCallBack("del", delFloor);
+                    string delFloor = DB_ResidenceData.residenceData.floors[(int)(sender as Button).Tag];
+                    refreshFloorList("del", delFloor);
                 };
                 new PublicAssmebly().TipMsg(StringId.Tip, StringId.DelFloorTip, action);
             };
@@ -83,10 +92,7 @@
                     room.floorIndex = DB_ResidenceData.residenceData.floors.IndexOf(lastButton.Text.Trim());
                 }
                 room.floorIndex = DB_ResidenceData.residenceData.floors.IndexOf(lastButton.Text.Trim());
-                if (backAction != null)
-                {
-                    backAction();
-                }
+                backAction?.Invoke();
                 bodyView.RemoveFromParent();
                 DB_ResidenceData.residenceData.SaveResidenceData();
             };

--
Gitblit v1.8.0