From f6fd8acd7c53c44187e70b4709443318a628f4b5 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 16 六月 2020 13:12:33 +0800
Subject: [PATCH] 2020-06-016
---
HDL_ON/UI/UI2/4-PersonalCenter/ResidentialManage/RoomEditPageBLL.cs | 39 +++++++++++++++++++++++++++++++++++++--
1 files changed, 37 insertions(+), 2 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/ResidentialManage/RoomEditPageBLL.cs b/HDL_ON/UI/UI2/4-PersonalCenter/ResidentialManage/RoomEditPageBLL.cs
index 2d492b1..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
{
@@ -37,6 +38,16 @@
}.Show(bodyView);
return;
}
+ if(string.IsNullOrEmpty( room.floor))
+ {
+ new Tip()
+ {
+ CloseTime = 3,
+ Text = Language.StringByID(StringId.PlsBindFloor),
+ Direction = AMPopTipDirection.None,
+ }.Show(bodyView);
+ return;
+ }
foreach (var tempRoom in DB_ResidenceData.residenceData.rooms)
{
if (room.name == tempRoom.name)
@@ -64,6 +75,7 @@
}
room.sid = "";
DB_ResidenceData.residenceData.rooms.Remove(room);
+ DB_ResidenceData.residenceData.SaveResidenceData();
backAction();
this.RemoveFromParent();
};
@@ -90,6 +102,17 @@
{
Action<string> callBack = (str) =>
{
+ //鎴块棿鍚嶇О涓嶈兘涓虹┖
+ if (string.IsNullOrEmpty(str))
+ {
+ new Tip()
+ {
+ CloseTime = 3,
+ Text = Language.StringByID(StringId.RoomNameCannotBeEmpty),
+ Direction = AMPopTipDirection.None,
+ }.Show(bodyView);
+ return;
+ }
btnRoomName.Text = btnTipRoomName.Text = str;
room.name = str;
if (pageTitleId == StringId.EditRoomInfo)
@@ -99,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;
@@ -133,7 +168,7 @@
{
EventHandler<MouseEventArgs> eventHandler = (sender, e) =>
{
- var residentialManagePage = new RoomEditFunctionPage(room.sid);
+ var residentialManagePage = new RoomEditFunctionPage(room);
MainPage.BasePageView.AddChidren(residentialManagePage);
residentialManagePage.LoadPage();
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
--
Gitblit v1.8.0