合并了IOS的代码

hxb

2022-08-30 25429f085093d89d543a0b90e30d0d62d1b7dac9

 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)

                {

                    //显示重新加载的界面

@@ -154,7 +154,7 @@
            var frameBack = new FrameListControl(29);

            frameBack.BackgroundColor = UserCenterColor.Current.White;

            frameBack.Height = 10;

            this.listView.AddChidrenFrame(frameBack);

            this.listView.AddChidren(frameBack);



            //楼层

            if (string.IsNullOrEmpty(floorId) == 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(() =>