From 6fa9d69da922c8049f5acfcbb9ce9fd26811024c Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期四, 16 四月 2020 17:10:57 +0800
Subject: [PATCH] 请合并代码
---
ZigbeeApp/Shared/Phone/UserCenter/SharedContent/LookSharedListRoomForm.cs | 39 +++++++++++++++++++++++----------------
1 files changed, 23 insertions(+), 16 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/SharedContent/LookSharedListRoomForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/SharedContent/LookSharedListRoomForm.cs
index 515d242..6e954e4 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/SharedContent/LookSharedListRoomForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/SharedContent/LookSharedListRoomForm.cs
@@ -77,11 +77,8 @@
this.ShowReLoadView();
return;
}
- //浠庢湰鍦拌幏鍙栨垚鍛樼殑鍒嗕韩鍒楄〃
- HdlShardLogic.Current.GetMemberShardContentListFromLocal(memberShardInfo);
//鍒濆鍖栧尯鍩熷垪琛�
this.InitAreaListRow();
-
});
}
@@ -127,7 +124,7 @@
bodyFrameLayout.AddChidren(listView);
//鎺掑簭妤煎眰
- var dicSort = Common.Room.CurrentRoom.GetFloorSortList();
+ var dicSort = HdlRoomLogic.Current.GetFloorSortList();
foreach (var floorId in dicSort.Keys)
{
if (dicGroup.ContainsKey(floorId) == true)
@@ -142,6 +139,8 @@
{
this.AddRoomListRow(floorId, dicGroup[floorId]);
}
+ //璋冩暣妗屽竷楂樺害
+ listView.AdjustTableHeight();
});
}
}
@@ -181,7 +180,7 @@
}
}
//鎴块棿鎺掑簭
- var listSortRoom = Common.Room.CurrentRoom.GetFloorSortRoom(floorId, false);
+ var listSortRoom = HdlRoomLogic.Current.GetFloorSortRoom(floorId, false);
var listSort = new HashSet<string>();
foreach (var room in listSortRoom)
{
@@ -226,6 +225,8 @@
}
frameRow.frameTable.ButtonClickEvent += (sender, e) =>
{
+ var form = new LookSharedContentForm();
+ form.AddForm(room, memberShardInfo);
};
//鍒犻櫎
@@ -262,25 +263,31 @@
{
//鑾峰彇鍏ㄩ儴璁惧
var listDevice = new List<CommonDevice>();
- foreach (var deviceUi in room.DeviceUIList)
+ foreach (var deviceKeys in room.ListDevice)
{
- var device = deviceUi.CommonDevice;
- if (device == null)
+ string deviceFile = HdlShardLogic.Current.GetShardDeviceFileName(deviceKeys);
+ if (deviceFile == string.Empty)
{
- string deviceFile = deviceUi.FileName;
- var byteData = HdlShardLogic.Current.GetShardFileContent(deviceFile);
- if (byteData == null)
- {
- continue;
- }
- device = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice>(System.Text.Encoding.UTF8.GetString(byteData));
+ continue;
}
+ var byteData = HdlShardLogic.Current.GetShardFileContent(deviceFile);
+ if (byteData == null)
+ {
+ continue;
+ }
+ var device = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice>(System.Text.Encoding.UTF8.GetString(byteData));
listDevice.Add(device);
}
//鑾峰彇鍏ㄩ儴鍦烘櫙
var listScene = new List<Common.SceneUI>();
- foreach (var sceneUi in room.SceneUIList)
+ foreach (var sceneId in room.ListSceneId)
{
+ var byteData = HdlShardLogic.Current.GetShardFileContent($"Scene_{sceneId}.json");
+ if (byteData == null)
+ {
+ continue;
+ }
+ var sceneUi = Newtonsoft.Json.JsonConvert.DeserializeObject<Common.SceneUI>(System.Text.Encoding.UTF8.GetString(byteData));
listScene.Add(sceneUi);
}
--
Gitblit v1.8.0