删除了郭雪城的 DeviceUi 这个类

黄学彪

2020-03-06 a5b3c4bae726ef6770d4bfcbf2f4b50a37ed4a15

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

@@ -163,19 +163,19 @@


            //场景有点特殊,如果同一个房间内,已经分享了,则不再显示 

            //如果这个场景是由嵌套而分享的,这个时候,它可以显示出来

            var listScene = new List<Common.SceneUI>();

            var listScene = new List<int>();

            if (memberShardInfo.dicShardRoom.ContainsKey(lookRoom.FileName) == false)

            {

                listScene.AddRange(lookRoom.SceneUIList);

                listScene.AddRange(lookRoom.ListSceneId);

            }

            else

            {

                var tempRoom = memberShardInfo.dicShardRoom[lookRoom.FileName];

                foreach (var data in lookRoom.SceneUIList)

                foreach (var dataId in lookRoom.ListSceneId)

                {

                    if (tempRoom.SceneUIFilePathList.Contains(data.FileName) == false)

                    if (tempRoom.ListSceneId.Contains(dataId) == false)

                    {

                        listScene.Add(data);

                        listScene.Add(dataId);

                    }

                }

            }

@@ -193,8 +193,13 @@
                listView.Height = bodyFrameLayout.Height - Application.GetRealHeight(187);

                frameSceneTable.AddChidren(listView);



                foreach (var data in listScene)

                foreach (var dataId in listScene)

                {

                    var data = HdlSceneLogic.Current.GetSceneUIBySceneId(dataId);

                    if (data == null)

                    {

                        continue;

                    }

                    //场景图片

                    var frameContr = new ScenePictrueControl();

                    listView.AddChidrenFrame(frameContr);

@@ -379,7 +384,7 @@
        private Dictionary<int, List<CommonDevice>> GetAllGroupDevice()

        {

            //全部的设备

            var listDevice = lookRoom.GetRoomListDevice();

            var listDevice = HdlRoomLogic.Current.GetRoomListDevice(lookRoom);

            var dic = new Dictionary<int, List<CommonDevice>>();

            foreach (var device in listDevice)

            {