From 7b60238359b94125d591678eff105ae2bf47843f Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期五, 15 十一月 2019 13:16:21 +0800
Subject: [PATCH] 2019.11.15
---
ZigbeeApp/Shared/Phone/UserCenter/SharedContent/LookSharedListRoomForm.cs | 17 +++++------------
1 files changed, 5 insertions(+), 12 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/SharedContent/LookSharedListRoomForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/SharedContent/LookSharedListRoomForm.cs
index 18168ad..c4a6ace 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/SharedContent/LookSharedListRoomForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/SharedContent/LookSharedListRoomForm.cs
@@ -77,8 +77,6 @@
this.ShowReLoadView();
return;
}
- //浠庢湰鍦拌幏鍙栨垚鍛樼殑鍒嗕韩鍒楄〃
- HdlShardLogic.Current.GetMemberShardContentListFromLocal(memberShardInfo);
//鍒濆鍖栧尯鍩熷垪琛�
this.InitAreaListRow();
@@ -266,19 +264,14 @@
{
//鑾峰彇鍏ㄩ儴璁惧
var listDevice = new List<CommonDevice>();
- foreach (var deviceUi in room.DeviceUIList)
+ foreach (var deviceFile in room.DeviceUIFilePathList)
{
- var device = deviceUi.CommonDevice;
- if (device == null)
+ var byteData = HdlShardLogic.Current.GetShardFileContent(deviceFile);
+ if (byteData == null)
{
- 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 device = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice>(System.Text.Encoding.UTF8.GetString(byteData));
listDevice.Add(device);
}
//鑾峰彇鍏ㄩ儴鍦烘櫙
--
Gitblit v1.8.0