From af4101b1d8461331bc3163b738fc75d4bf67c85c Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期二, 28 七月 2020 17:47:44 +0800
Subject: [PATCH] 2020-07-28-1
---
HDL_ON/UI/UI2/4-PersonalCenter/ResidentialManage/RoomEditPageBLL.cs | 25 ++++++++++++++++++++++++-
1 files changed, 24 insertions(+), 1 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/ResidentialManage/RoomEditPageBLL.cs b/HDL_ON/UI/UI2/4-PersonalCenter/ResidentialManage/RoomEditPageBLL.cs
index b0be26b..5616bc7 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/ResidentialManage/RoomEditPageBLL.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/ResidentialManage/RoomEditPageBLL.cs
@@ -1,6 +1,7 @@
锘縰sing System;
using Shared;
using HDL_ON.Entity;
+using System.Collections.Generic;
namespace HDL_ON.UI
{
@@ -33,6 +34,16 @@
{
CloseTime = 3,
Text = Language.StringByID(StringId.RoomNameCannotBeEmpty),
+ Direction = AMPopTipDirection.None,
+ }.Show(bodyView);
+ return;
+ }
+ if(string.IsNullOrEmpty( room.floor))
+ {
+ new Tip()
+ {
+ CloseTime = 3,
+ Text = Language.StringByID(StringId.PlsBindFloor),
Direction = AMPopTipDirection.None,
}.Show(bodyView);
return;
@@ -111,7 +122,19 @@
};
EventHandler<MouseEventArgs> eventHandler = (sender, e) =>
{
- new PublicAssmebly().LoadDialog_EditParater(StringId.RoomName, room.name, callBack);
+ List<string> roomNameList = new List<string>();
+ foreach(var rroom in DB_ResidenceData.residenceData.rooms)
+ {
+ 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);
+ }
};
btnEditRoomNameIcon.MouseUpEventHandler = eventHandler;
roomNameRow.MouseUpEventHandler = eventHandler;
--
Gitblit v1.8.0