From c3e1b733fc45bd9f0b88bfb560cfa87a270b079b Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 09 九月 2020 17:33:58 +0800
Subject: [PATCH] 20200909

---
 HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomEditPageBLL.cs |   30 ++++++++++++++----------------
 1 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/ResidentialManage/RoomEditPageBLL.cs b/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomEditPageBLL.cs
similarity index 92%
rename from HDL_ON/UI/UI2/4-PersonalCenter/ResidentialManage/RoomEditPageBLL.cs
rename to HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomEditPageBLL.cs
index d4c108f..b33d810 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/ResidentialManage/RoomEditPageBLL.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomEditPageBLL.cs
@@ -33,7 +33,7 @@
                     {
                         new Tip()
                         {
-                            CloseTime = 3,
+                            CloseTime = 1,
                             Text = Language.StringByID(StringId.RoomNameCannotBeEmpty),
                             Direction = AMPopTipDirection.None,
                         }.Show(bodyView);
@@ -43,7 +43,7 @@
                     {
                         new Tip()
                         {
-                            CloseTime = 3,
+                            CloseTime = 1,
                             Text = Language.StringByID(StringId.PlsBindFloor),
                             Direction = AMPopTipDirection.None,
                         }.Show(bodyView);
@@ -57,8 +57,7 @@
                             return;
                         }
                     }
-
-                    DB_ResidenceData.DelRoom(room);
+                    DB_ResidenceData.rooms.Add(room);
                     backAction();
                     this.RemoveFromParent();
                 }
@@ -73,7 +72,6 @@
                                 f.roomIdList.Remove(room.sid);
                             }
                         }
-                        room.sid = "";
                         DB_ResidenceData.DelRoom(room);
                         backAction();
                         this.RemoveFromParent();
@@ -106,13 +104,13 @@
                 {
                     new Tip()
                     {
-                        CloseTime = 3,
+                        CloseTime = 1,
                         Text = Language.StringByID(StringId.RoomNameCannotBeEmpty),
                         Direction = AMPopTipDirection.None,
                     }.Show(bodyView);
                     return;
                 }
-                btnRoomName.Text = btnTipRoomName.Text = str;
+                btnRoomName.Text = str;
                 room.name = str;
                 if (pageTitleId == StringId.EditRoomInfo)
                 {
@@ -127,13 +125,13 @@
                     roomNameList.Add(rroom.name);
                 }
                 if (pageTitleId == StringId.AddRoom)
-                {
-                    new PublicAssmebly().LoadDialog_EditParater(StringId.RoomName, room.name, callBack, StringId.RoomNameCannotBeEmpty, StringId.AddingFailed_RoomAlreadyExists, roomNameList);
-                }
-                else
-                {
-                    new PublicAssmebly().LoadDialog_EditParater(StringId.RoomName, room.name, callBack, StringId.RoomNameCannotBeEmpty, StringId.EidtFailed_RoomAlreadyExists, roomNameList);
-                }
+                //{
+                    new PublicAssmebly().LoadDialog_EditParater(StringId.RoomName, room.name, callBack, StringId.RoomNameCannotBeEmpty, StringId.RoomNameAlreadyExists, roomNameList);
+                //}
+                //else
+                //{
+                //    new PublicAssmebly().LoadDialog_EditParater(StringId.RoomName, room.name, callBack, StringId.RoomNameCannotBeEmpty, StringId.EidtFailed_RoomAlreadyExists, roomNameList);
+                //}
             };
             btnEditRoomNameIcon.MouseUpEventHandler = eventHandler;
             roomNameRow.MouseUpEventHandler = eventHandler;
@@ -243,7 +241,7 @@
                 {
                     room.SaveRoomData();
                 }
-                pictureOptionView.RemoveFromParent();
+                baseView.RemoveFromParent();
             };
             btnAlbum.MouseDownEventHandler = (sender, e) => {
                 btnAlbum.IsSelected = true;
@@ -266,7 +264,7 @@
                 {
                     room.SaveRoomData();
                 }
-                pictureOptionView.RemoveFromParent();
+                baseView.RemoveFromParent();
             };
         }
     }

--
Gitblit v1.8.0