删除了郭雪城的 DeviceUi 这个类

黄学彪

2020-03-06 a5b3c4bae726ef6770d4bfcbf2f4b50a37ed4a15

 ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/AddScenePage.cs

@@ -183,14 +183,15 @@

            #region 数据处理  
            //获取楼层
            dicFloor = Common.Room.CurrentRoom.GetFloorSortList();
            dicFloor = HdlRoomLogic.Current.GetFloorSortList();
            currentKey.currentSelectFloorId = BindInfo.GetCurrentSelectFloorId();
            btnFloorText.Text = BindInfo.GetCurrentSelectFloorIdName();

            btnFloorText.Text = BindInfo.GetCurrentSelectFloorIdName();



            var listAllRoom = HdlRoomLogic.Current.GetAllListRooms();
            if (Common.Config.Instance.Home.FloorDics.Count == 0)
            {
                // 获取没有楼层房间
                foreach (var room in Shared.Common.Room.Lists)
                foreach (var room in listAllRoom)
                {
                    if (string.IsNullOrEmpty(room.FloorId))
                    {
@@ -201,7 +202,7 @@
            else
            {
                // 获取楼层对应对房间
                foreach (var room in Shared.Common.Room.Lists)
                foreach (var room in listAllRoom)
                {
                    if (room.FloorId == currentKey.currentSelectFloorId)
                    {
@@ -235,7 +236,7 @@
            int index = 0;
            RefreshRoomList(curRoom, ref index);

            if (curRoom.SceneUIList.Count == 0)
            if (curRoom.ListSceneId.Count == 0)
            {
                btnFinifh.Enable = false;
                btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMUnSelect;
@@ -479,7 +480,7 @@
                }

                //如果房间中没有场景，则不显示
                if (room.SceneUIList.Count == 0)
                if (room.ListSceneId.Count == 0)
                {
                    continue;
                }
@@ -549,7 +550,7 @@
                    }
                    curRoom = room;
                    currentKey.RoomId = room.Id;
                    if (curRoom.SceneUIList.Count == 0)
                    if (curRoom.ListSceneId.Count == 0)
                    {
                        btnFinifh.Enable = false;
                        btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMUnSelect;
@@ -587,7 +588,7 @@
        void RefreshSceneList(Shared.Common.Room curRoom)
        {
            midVerticalScrolViewLayout.RemoveAll();
            if (curRoom.SceneUIList.Count == 0)
            if (curRoom.ListSceneId.Count == 0)
            {
                return;
            }
@@ -651,7 +652,7 @@
                };
                rowLayout.AddChidren(line2);

                if (curIndex == curRoom.SceneUIList.Count - 1)
                if (curIndex == curRoom.ListSceneId.Count - 1)
                {
                    line2.Visible = false;
                }
@@ -868,10 +869,11 @@
                        btnMethodText.IsSelected = true;
                        oldbuttonText.TextColor = Shared.Common.ZigbeeColor.Current.XMBlack;
                        oldbuttonText.IsBold = true;
                    }

                    //获取楼层对应的房间
                    foreach (var room in Shared.Common.Room.Lists)
                    }



                    //获取楼层对应的房间

                    var listAllRoom = HdlRoomLogic.Current.GetAllListRooms();
                    foreach (var room in listAllRoom)
                    {
                        if (room.FloorId == currentKey.currentSelectFloorId)
                        {
@@ -916,9 +918,10 @@
        /// <returns></returns>
        List<SceneUI> GetALlDispalyRoomSceneList()
        {
            currentKeyAllRoomSceneList.Clear();
            // 获取所有房间 
            foreach (var room in Shared.Common.Room.Lists)
            currentKeyAllRoomSceneList.Clear();

            // 获取所有房间 
            var listAllRoom = HdlRoomLogic.Current.GetAllListRooms();
            foreach (var room in listAllRoom)
            {
                //如果房间为喜爱，则不显示
                if (room.IsLove == true)
@@ -926,13 +929,18 @@
                    continue;
                }
                //如果房间中没有场景，则不显示
                if (room.SceneUIList.Count == 0)
                if (room.ListSceneId.Count == 0)
                {
                    continue;
                }

                foreach (var scene in room.SceneUIList)
                {
                foreach (var sceneId in room.ListSceneId)
                {

                    var scene = HdlSceneLogic.Current.GetSceneUIBySceneId(sceneId);
                    if (scene == null)
                    {
                        continue;
                    }
                    currentKeyAllRoomSceneList.Add(scene);
                }
            }
@@ -946,9 +954,14 @@
        List<SceneUI> GetMatchSceneUIList(Shared.Common.Room curRoom)
        {
            var tempSceneUIList = new List<SceneUI>();
            foreach (var scene in curRoom.SceneUIList)
            foreach (var sceneId in curRoom.ListSceneId)
            {
                var gwSc = gwCurScenesList.Find(obj => (obj.ScenesId == scene.Id));
                var scene = HdlSceneLogic.Current.GetSceneUIBySceneId(sceneId);

                if (scene == null)

                {

                    continue;

                }
                var gwSc = gwCurScenesList.Find(obj => (obj.ScenesId == sceneId));
                if (gwSc != null)
                {
                    tempSceneUIList.Add(scene);