From adc150efb13a0506f45a3c344c3ee2ef2dba8e90 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 01 七月 2021 15:19:13 +0800
Subject: [PATCH] 合并嘉乐lc代码
---
HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomEditPageBLL.cs | 133 ++++++++++++++++++--------------------------
1 files changed, 54 insertions(+), 79 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomEditPageBLL.cs b/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomEditPageBLL.cs
index c3c4ca3..25a6f44 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomEditPageBLL.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomEditPageBLL.cs
@@ -29,63 +29,51 @@
{
btnOption.MouseUpEventHandler = (sender, e) =>
{
- if (btnOption.TextID == StringId.Save)
+ Action action = () =>
{
- if (string.IsNullOrEmpty(room.roomName))
+ var waitPage = new Loading();
+ waitPage.Start();
+ new Thread(() =>
{
- new Tip()
+ try
{
- 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 DB_ResidenceData.residenceData.Rooms)
- {
- if (room.roomName == tempRoom.roomName)
- {
- new PublicAssmebly().TipMsg(StringId.Tip, StringId.AddingFailed_RoomAlreadyExists);
- return;
- }
- }
- SpatialInfo.CurrentSpatial.AddRoom(room);
- room.SaveRoomData();
- backAction();
- this.RemoveFromParent();
- }
- if (btnOption.TextID == StringId.DeleteRoom)
- {
- Action action = () =>
- {
- foreach (var f in DB_ResidenceData.functionList.GetAllFunction())
- {
- if (f.roomIds.Contains(room.uid))
+ var delResult = SpatialInfo.CurrentSpatial.DelRoom(room);
+ if (delResult == StateCode.SUCCESS)
{
- f.roomIds.Remove(room.uid);
+ foreach (var f in FunctionList.List.GetDeviceFunctionList())
+ {
+ if (f.roomIds.Contains(room.roomId))
+ {
+ f.roomIds.Remove(room.roomId);
+ }
+ }
+ Application.RunOnMainThread(() =>
+ {
+ //鍒犻櫎浜嬩欢鍥炶皟
+ this.deleteAction?.Invoke();
+ this.RemoveFromParent();
+ });
}
}
- SpatialInfo.CurrentSpatial.DelRoom(room);
- // backAction();
- // DB_ResidenceData.DelRoom(room);
- //鍒犻櫎浜嬩欢鍥炶皟
- this.deleteAction?.Invoke();
- this.RemoveFromParent();
- };
- new PublicAssmebly().TipMsg(StringId.Tip, StringId.DeleteRoomTip, action);
+ catch (Exception ex)
+ {
+ MainPage.Log($"娣诲姞鎴块棿澶辫触msg:{ex.Message}");
+ }
+ finally
+ {
+ Application.RunOnMainThread(() =>
+ {
+ waitPage.Hide();
+ waitPage.RemoveFromParent();
+ });
+ }
+ })
+ { IsBackground = true }.Start();
};
+ new PublicAssmebly().TipOptionMsg(StringId.Tip, StringId.DeleteRoomTip, action);
};
}
+
/// <summary>
/// 鏄剧ず鑳屾櫙鍥鹃�夋嫨閫夐」
@@ -118,26 +106,16 @@
}
btnRoomName.Text = str;
room.roomName = str;
- if (pageTitleId == StringId.EditRoomInfo)
- {
- room.SaveRoomData();
- }
+ room.UpdataRoomInfo();
};
EventHandler<MouseEventArgs> eventHandler = (sender, e) =>
{
List<string> roomNameList = new List<string>();
- foreach (var rroom in DB_ResidenceData.residenceData.Rooms)
+ foreach (var rroom in SpatialInfo.CurrentSpatial.RoomList)
{
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;
@@ -154,10 +132,11 @@
Action floorsCallBackAction = () =>
{
btnFloorInfo.Text = room.floorName;
+ room.UpdataRoomInfo();
};
- var residentialManagePage = new FloorsManagementPage(floorsCallBackAction);
+ var residentialManagePage = new RoomBinglingFloorPage(floorsCallBackAction, room);
MainPage.BasePageView.AddChidren(residentialManagePage);
- residentialManagePage.LoadPage(room, StringId.FloorAssignment);
+ residentialManagePage.LoadPage();
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
};
btnFloorInfo.MouseUpEventHandler = eventHandler;
@@ -272,13 +251,13 @@
//鎴块棿榛樿鍥惧簱
btnDefaultGallery.MouseUpEventHandler = (sender, e) => {
pictureOptionView.Parent.RemoveFromParent();
- Action<string> action = (obj) => {
+ Action<string> action = (obj) =>
+ {
room.backgroundImage = obj;
+ btnRoomBg.ImageBytes = null;//瑙ｅ喅鏈塈mageBytes涓嶅姞杞絀magePath
btnRoomBg.ImagePath = room.backgroundImage;
- if (pageTitleId == StringId.EditRoomInfo)
- {
- room.SaveRoomData();
- }
+ room.UpdataRoomInfo();
+ modifyImageAction?.Invoke();
};
var galleryPage = new RoomGalleryPage(room.backgroundImage, action);
@@ -305,12 +284,8 @@
{
//2020-12-03 闇�瑕佽鏈�鏂扮殑鍥剧墖璺緞鍚屾鍒颁簯绔�
room.backgroundImage = imageUrl;
- if (pageTitleId == StringId.EditRoomInfo)
- {
- room.SaveRoomData();
-
-
- }
+ room.UpdataRoomInfo();
+ modifyImageAction?.Invoke();
};
//涓婁紶鍥剧墖鍒颁簯绔�
UploadImage(selectImagePath, btnRoomBg, room, uploadSuccessAction);
@@ -326,7 +301,7 @@
{
try
{
- MainPage.Log("SelectPicture 瑁佸壀鍥剧墖杩斿洖璺緞: " + selectImagePath);
+ //MainPage.Log("SelectPicture 瑁佸壀鍥剧墖杩斿洖璺緞: " + selectImagePath);
//1.璇诲彇瑁佸壀鍚庣殑鍥剧墖锛岀劧鍚庡垹闄�
var imageBytes = Shared.IO.FileUtils.ReadFile(selectImagePath);
System.IO.File.Delete(selectImagePath);
@@ -342,7 +317,7 @@
var newImageName = mRoom.roomName.Trim() + ".png";
var uploadImageObj = new UploadImageObj()
{
- prefix = "ONR",
+ prefix = "Room" + Utlis.GetTimestamp(),
fileName = newImageName,
uid = mRoom.uid,
content = imageBytes,
@@ -354,15 +329,15 @@
//涓婁紶鎴愬姛
Application.RunOnMainThread(() =>
{
- Utlis.WriteLine("涓婁紶鎴愬姛锛�" + imageUrl);
+ //Utlis.WriteLine("涓婁紶鎴愬姛锛�" + imageUrl);
//1.2濡傛灉鏄嚜瀹氫箟鍥剧墖鍒犻櫎涔嬪墠鐨�
if (!string.IsNullOrEmpty(imageView.ImagePath) && !imageView.ImagePath.Contains("Classification/Room/Roombg"))
{
- Utlis.WriteLine("鍒犻櫎: " + imageView.ImagePath);
+ //Utlis.WriteLine("鍒犻櫎: " + imageView.ImagePath);
System.IO.File.Delete(imageView.ImagePath);
}
//閲嶅懡鍚嶄繚瀛�
- FileUtils.WriteFileByBytes(imageUrl, imageBytes);
+ ImageUtlis.Current.WriteFileByBytes(imageUrl, imageBytes);
imageView.ImagePath = null;
imageView.ImageBytes = imageBytes;
//涓婁紶鎴愬姛
--
Gitblit v1.8.0