From 43b0d5870d528f23ecd6aeceb6cfd4325188b46f Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 01 七月 2021 15:50:43 +0800
Subject: [PATCH] Revert "1"
---
HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/AddRoom/AddRoomPage.cs | 63 ++++++++++++++++++++++---------
1 files changed, 45 insertions(+), 18 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/AddRoom/AddRoomPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/AddRoom/AddRoomPage.cs
index c98be11..601ccd4 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/AddRoom/AddRoomPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/AddRoom/AddRoomPage.cs
@@ -264,7 +264,7 @@
btnFunctionManagementTitle = new Button()
{
X = Application.GetRealWidth(16),
- Width = Application.GetRealWidth(120),
+ Width = Application.GetRealWidth(220),
TextAlignment = TextAlignment.CenterLeft,
TextColor = CSS_Color.FirstLevelTitleColor,
TextSize = CSS_FontSize.SubheadingFontSize,
@@ -437,7 +437,7 @@
}.Show(bodyView);
return;
}
- foreach (var tempRoom in DB_ResidenceData.residenceData.Rooms)
+ foreach (var tempRoom in SpatialInfo.CurrentSpatial.RoomList)
{
if (room.roomName == tempRoom.roomName)
{
@@ -445,26 +445,52 @@
return;
}
}
- var addResult = SpatialInfo.CurrentSpatial.AddRoom(room);//妫�鏌oom鏄惁涓轰簯绔繑鍥炵殑鏈�鏂版暟鎹�
- if (addResult == StateCode.SUCCESS)
+ var waitPage = new Loading();
+ waitPage.Start();
+ new Thread(() =>
{
- var deviceIds = new List<string>();
- foreach (var f in roomFunctions)
+ try
{
- deviceIds.Add(f.deviceId);
+ var addResult = SpatialInfo.CurrentSpatial.AddRoom(room, out room);//妫�鏌oom鏄惁涓轰簯绔繑鍥炵殑鏈�鏂版暟鎹�
+ if (addResult == StateCode.SUCCESS)
+ {
+ var deviceIds = new List<string>();
+ foreach (var f in roomFunctions)
+ {
+ deviceIds.Add(f.deviceId);
+ }
+ if (deviceIds.Count > 0)
+ {
+ var bindResult = FunctionList.List.FunctionsBindRooms(new List<string>() { room.roomId }, deviceIds);
+ if (bindResult == StateCode.SUCCESS)
+ {
+ foreach (var f in roomFunctions)
+ {
+ f.roomIds.Add(room.roomId);
+ }
+ room.GetRoomFunctions(true);
+ }
+ }
+ Application.RunOnMainThread(() =>
+ {
+ backAction(room);
+ RemoveFromParent();
+ });
+ }
}
- var bindResult = FunctionList.List.FunctionsBindRooms(new List<string>() { room.roomId }, deviceIds);
- if (bindResult == StateCode.SUCCESS)
+ catch (Exception ex)
{
- room.GetRoomFunctions(true);
+ MainPage.Log($"娣诲姞鎴块棿澶辫触msg:{ex.Message}");
}
- else
+ finally
{
- //Utlis.ShowTip(Language.StringByID(StringId.EditFunctionInfoFail) + "\r\nCode:" + pack.Code);
+ Application.RunOnMainThread(() =>
+ {
+ waitPage.Hide();
+ });
}
- backAction(room);
- RemoveFromParent();
- }
+ })
+ { IsBackground = true }.Start();
};
}
@@ -503,7 +529,7 @@
EventHandler<MouseEventArgs> eventHandler = (sender, e) =>
{
List<string> roomNameList = new List<string>();
- foreach (var temp in DB_ResidenceData.residenceData.Rooms)
+ foreach (var temp in SpatialInfo.CurrentSpatial.RoomList)
{
roomNameList.Add(temp.roomName);
}
@@ -618,6 +644,7 @@
pictureOptionView.Parent.RemoveFromParent();
Action<string> action = (obj) => {
room.backgroundImage = obj;
+ btnRoomBg.ImageBytes = null;//瑙ｅ喅鏈塈mageBytes涓嶅姞杞絀magePath
btnRoomBg.ImagePath = room.backgroundImage;
};
@@ -661,7 +688,7 @@
{
//MainPage.Log("SelectPicture 瑁佸壀鍥剧墖杩斿洖璺緞: " + selectImagePath);
//1.璇诲彇瑁佸壀鍚庣殑鍥剧墖锛岀劧鍚庡垹闄�
- var imageBytes = Shared.IO.FileUtils.ReadFile(selectImagePath);
+ var imageBytes = ImageUtlis.Current.ReadFile(selectImagePath);
System.IO.File.Delete(selectImagePath);
var waitPage = new Loading();
@@ -695,7 +722,7 @@
System.IO.File.Delete(imageView.ImagePath);
}
//閲嶅懡鍚嶄繚瀛�
- Common.FileUtlis.Files.WriteFileByBytes(imageUrl, imageBytes);
+ ImageUtlis.Current.WriteFileByBytes(imageUrl, imageBytes);
imageView.ImagePath = null;
imageView.ImageBytes = imageBytes;
//涓婁紶鎴愬姛
--
Gitblit v1.8.0