2020-07-10-01

陈嘉乐

2020-07-10 48ba446936b51fffafa7c3600c0dadc6ac0e8c20

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

@@ -79,7 +79,6 @@
                }

                //初始化区域列表

                this.InitAreaListRow();



            });

        }



@@ -125,7 +124,7 @@
                    bodyFrameLayout.AddChidren(listView);



                    //排序楼层

                    var dicSort = Common.Room.CurrentRoom.GetFloorSortList();

                    var dicSort = HdlRoomLogic.Current.GetFloorSortList();

                    foreach (var floorId in dicSort.Keys)

                    {

                        if (dicGroup.ContainsKey(floorId) == true)

@@ -155,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)

@@ -181,7 +180,7 @@
                }

            }

            //房间排序

            var listSortRoom = Common.Room.CurrentRoom.GetFloorSortRoom(floorId, false);

            var listSortRoom = HdlRoomLogic.Current.GetFloorSortRoom(floorId, false);

            var listSort = new HashSet<string>();

            foreach (var room in listSortRoom)

            {

@@ -264,8 +263,13 @@
        {

            //获取全部设备

            var listDevice = new List<CommonDevice>();

            foreach (var deviceFile in room.DeviceUIFilePathList)

            foreach (var deviceKeys in room.ListDevice)

            {

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

                if (deviceFile == string.Empty)

                {

                    continue;

                }

                var byteData = HdlShardLogic.Current.GetShardFileContent(deviceFile);

                if (byteData == null)

                {

@@ -276,8 +280,14 @@
            }

            //获取全部场景

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

            foreach (var sceneUi in room.SceneUIList)

            foreach (var sceneId in room.ListSceneId)

            {

                var byteData = HdlShardLogic.Current.GetShardFileContent($"Scene_{sceneId}.json");

                if (byteData == null)

                {

                    continue;

                }

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

                listScene.Add(sceneUi);

            }