Merge remote-tracking branch 'origin/dev-tzy' into dev-wjc

WJC

2019-11-07 2109463fab2eb1caed189e4f258e0e763c5cea7b

 ZigbeeApp/Shared/Phone/UserCenter/SharedContent/LookSharedListRoomForm.cs

@@ -77,8 +77,6 @@
                    this.ShowReLoadView();

                    return;

                }

                //从本地获取成员的分享列表

                HdlShardLogic.Current.GetMemberShardContentListFromLocal(memberShardInfo);

                //初始化区域列表

                this.InitAreaListRow();



@@ -142,6 +140,8 @@
                    {

                        this.AddRoomListRow(floorId, dicGroup[floorId]);

                    }

                    //调整桌布高度

                    listView.AdjustTableHeight();

                });

            }

        }

@@ -226,6 +226,8 @@
                }

                frameRow.frameTable.ButtonClickEvent += (sender, e) =>

                {

                    var form = new LookSharedContentForm();

                    form.AddForm(room, memberShardInfo);

                };



                //删除

@@ -262,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);

            }

            //获取全部场景