Merge branch 'dev-tzy' into dev-2020xm

xm

2020-07-14 d87400af518ebc9274f4447f06476959c3aa5102

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

@@ -67,10 +67,10 @@
            //清空bodyFrame

            this.ClearBodyFrame();



            HdlThreadLogic.Current.RunThread(async () =>

            HdlThreadLogic.Current.RunThread(() =>

            {

                //获取成员的共享列表

                var result = await HdlShardLogic.Current.GetMemberShardContentListAndSetToLocation(memberShardInfo);

                var result = HdlShardLogic.Current.GetMemberShardContentListAndSetToLocation(memberShardInfo);

                if (result == false)

                {

                    //显示重新加载的界面

@@ -276,6 +276,7 @@
                    continue;

                }

                var device = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice>(System.Text.Encoding.UTF8.GetString(byteData));

                device.Type = (DeviceType)device.DeviceID;

                listDevice.Add(device);

            }

            //获取全部场景

@@ -291,10 +292,10 @@
                listScene.Add(sceneUi);

            }



            HdlThreadLogic.Current.RunThread(async () =>

            HdlThreadLogic.Current.RunThread(() =>

            {

                //执行删除

                var result = await HdlShardLogic.Current.DoDeleteSharedContent(memberShardInfo, room, listDevice, listScene);

                var result = HdlShardLogic.Current.DoDeleteSharedContent(memberShardInfo, room, listDevice, listScene);

                if (result == true)

                {

                    HdlThreadLogic.Current.RunMain(() =>