From 271015c6e90c195103cc7f34eda87966acd74dcc Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期日, 13 十二月 2020 20:46:12 +0800
Subject: [PATCH] 2020121301

---
 HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomEditPageBLL.cs |   92 +++++++++-------------------------------------
 1 files changed, 18 insertions(+), 74 deletions(-)

diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomEditPageBLL.cs b/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomEditPageBLL.cs
index 7e32122..424a911 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomEditPageBLL.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomEditPageBLL.cs
@@ -29,64 +29,24 @@
         {
             btnOption.MouseUpEventHandler = (sender, e) =>
             {
-                if (btnOption.TextID == StringId.Save)
+                Action action = () =>
                 {
-                    if (string.IsNullOrEmpty(room.roomName))
+                    var delResult = SpatialInfo.CurrentSpatial.DelRoom(room);
+                    if (delResult == StateCode.SUCCESS)
                     {
-                        new Tip()
+                        foreach (var f in FunctionList.List.GetDeviceFunctionList())
                         {
-                            CloseTime = 1,
-                            Text = Language.StringByID(StringId.RoomNameCannotBeEmpty),
-                            Direction = AMPopTipDirection.None,
-                        }.Show(bodyView);
-                        return;
-                    }
-                    if (string.IsNullOrEmpty(room.floorName))
-                    {
-                        new Tip()
-                        {
-                            CloseTime = 1,
-                            Text = Language.StringByID(StringId.PlsBindFloor),
-                            Direction = AMPopTipDirection.None,
-                        }.Show(bodyView);
-                        return;
-                    }
-                    foreach (var tempRoom in SpatialInfo.CurrentSpatial.RoomList)
-                    {
-                        if (room.roomName == tempRoom.roomName)
-                        {
-                            new PublicAssmebly().TipMsg(StringId.Tip, StringId.AddingFailed_RoomAlreadyExists);
-                            return;
+                            if (f.roomIds.Contains(room.roomId))
+                            {
+                                f.roomIds.Remove(room.roomId);
+                            }
                         }
-                    }
-                    var addResult = SpatialInfo.CurrentSpatial.AddRoom(room,out room);
-                    if (addResult == StateCode.SUCCESS)
-                    {
-                        backAction();
+                        //鍒犻櫎浜嬩欢鍥炶皟
+                        this.deleteAction?.Invoke();
                         this.RemoveFromParent();
                     }
-                }
-                if (btnOption.TextID == StringId.DeleteRoom)
-                {
-                    Action action = () =>
-                    {
-                        var delResult = SpatialInfo.CurrentSpatial.DelRoom(room);
-                        if (delResult == StateCode.SUCCESS)
-                        {
-                            foreach (var f in FunctionList.List.GetDeviceFunctionList())
-                            {
-                                if (f.roomIds.Contains(room.roomId))
-                                {
-                                    f.roomIds.Remove(room.roomId);
-                                }
-                            }
-                            //鍒犻櫎浜嬩欢鍥炶皟
-                            this.deleteAction?.Invoke();
-                            this.RemoveFromParent();
-                        }
-                    };
-                    new PublicAssmebly().TipMsg(StringId.Tip, StringId.DeleteRoomTip, action);
                 };
+                new PublicAssmebly().TipOptionMsg(StringId.Tip, StringId.DeleteRoomTip, action);
             };
         }
 
@@ -121,10 +81,7 @@
                 }
                 btnRoomName.Text = str;
                 room.roomName = str;
-                if (pageTitleId == StringId.EditRoomInfo)
-                {
-                    room.SaveRoomData();
-                }
+                room.SaveRoomData();
             };
             EventHandler<MouseEventArgs> eventHandler = (sender, e) =>
             {
@@ -133,14 +90,7 @@
                 {
                     roomNameList.Add(rroom.roomName);
                 }
-                if (pageTitleId == StringId.AddRoom)
-                {
-                    new PublicAssmebly().LoadDialog_EditParater(StringId.RoomName, room.roomName, callBack, StringId.RoomNameCannotBeEmpty, StringId.RoomNameAlreadyExists, roomNameList);
-                }
-                else
-                {
-                    new PublicAssmebly().LoadDialog_EditParater(StringId.RoomName, room.roomName, callBack, StringId.RoomNameCannotBeEmpty, StringId.EidtFailed_RoomAlreadyExists, roomNameList);
-                }
+                new PublicAssmebly().LoadDialog_EditParater(StringId.RoomName, room.roomName, callBack, StringId.RoomNameCannotBeEmpty, StringId.EidtFailed_RoomAlreadyExists, roomNameList);
             };
             btnEditRoomNameIcon.MouseUpEventHandler = eventHandler;
             roomNameRow.MouseUpEventHandler = eventHandler;
@@ -157,6 +107,7 @@
                 Action floorsCallBackAction = () =>
                 {
                     btnFloorInfo.Text = room.floorName;
+                    room.SaveRoomData();
                 };
                 var residentialManagePage = new RoomBinglingFloorPage(floorsCallBackAction, room);
                 MainPage.BasePageView.AddChidren(residentialManagePage);
@@ -275,13 +226,11 @@
             //鎴块棿榛樿鍥惧簱
             btnDefaultGallery.MouseUpEventHandler = (sender, e) => {
                 pictureOptionView.Parent.RemoveFromParent();
-                Action<string> action = (obj) => {
+                Action<string> action = (obj) =>
+                {
                     room.backgroundImage = obj;
                     btnRoomBg.ImagePath = room.backgroundImage;
-                    if (pageTitleId == StringId.EditRoomInfo)
-                    {
-                        room.SaveRoomData();
-                    }
+                    room.SaveRoomData();
                 };
 
                 var galleryPage = new RoomGalleryPage(room.backgroundImage, action);
@@ -308,12 +257,7 @@
             {
                 //2020-12-03 闇�瑕佽鏈�鏂扮殑鍥剧墖璺緞鍚屾鍒颁簯绔�
                 room.backgroundImage = imageUrl;
-                if (pageTitleId == StringId.EditRoomInfo)
-                {
-                    room.SaveRoomData();
-
-
-                }
+                room.SaveRoomData();
             };
             //涓婁紶鍥剧墖鍒颁簯绔�
             UploadImage(selectImagePath, btnRoomBg, room, uploadSuccessAction);

--
Gitblit v1.8.0