删除了郭雪城的 DeviceUi 这个类

黄学彪

2020-03-06 a5b3c4bae726ef6770d4bfcbf2f4b50a37ed4a15

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

@@ -155,12 +155,15 @@
            this.frameSceneTable.RemoveAll();



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

            for (int i = 0; i < lookRoom.SceneUIList.Count; i++)

            for (int i = 0; i < lookRoom.ListSceneId.Count; i++)

            {

                if (HdlShardLogic.Current.IsFileExists(lookRoom.SceneUIList[i].FileName) == true)

                var byteData = HdlShardLogic.Current.GetShardFileContent($"Scene_{lookRoom.ListSceneId[i]}.json");

                if (byteData == null)

                {

                    listScene.Add(lookRoom.SceneUIList[i]);

                    continue;

                }

                var sceneUi = Newtonsoft.Json.JsonConvert.DeserializeObject<Common.SceneUI>(System.Text.Encoding.UTF8.GetString(byteData));

                listScene.Add(sceneUi);

            }

            if (listScene.Count == 0)

            {

@@ -171,7 +174,7 @@


            HdlThreadLogic.Current.RunMainInThread(() =>

            {

                var listView = new VerticalFrameControl(29);

                var listView = new VerticalFrameControl(3);

                listView.Y = Application.GetRealHeight(53);

                listView.Height = bodyFrameLayout.Height - Application.GetRealHeight(187);

                frameSceneTable.AddChidren(listView);

@@ -430,8 +433,9 @@
        {

            //获取这个房间里面的分享设备

            var listDevice = new List<CommonDevice>();

            foreach (var deviceFile in this.lookRoom.DeviceUIFilePathList)

            foreach (var deviceKeys in this.lookRoom.ListDevice)

            {

                string deviceFile = HdlShardLogic.Current.GetShardDeviceFileName(deviceKeys);

                if (memberShardInfo.dicAllShardKeys.ContainsKey(deviceFile) == true)

                {

                    var strArry = deviceFile.Split('_');