Merge branch 'dev-tzy' into dev-2020xm

xm

2020-07-14 d87400af518ebc9274f4447f06476959c3aa5102

 ZigbeeApp/Shared/Phone/MainPage/LeftListRoomViewFrom.cs

File was renamed from ZigbeeApp/Shared/Phone/MainPage/ListRoomViewFrom.cs
@@ -10,22 +10,22 @@
    /// <summary>

    /// 左滑菜单的的房间列表界面

    /// </summary>
    public class ListRoomViewFrom : EditorCommonForm
    public class LeftListRoomViewFrom : EditorCommonForm
    {

        #region ■ 变量声明___________________________



        private static ListRoomViewFrom roomManagement = null;
        private static LeftListRoomViewFrom roomManagement = null;
        /// <summary>

        /// 左滑菜单的的房间对象

        /// </summary>
        public static ListRoomViewFrom Instance
        public static LeftListRoomViewFrom Instance
        {
            get
            {

                if (roomManagement == null)

                {

                    //初始化左滑菜单

                    roomManagement = new ListRoomViewFrom();

                    roomManagement = new LeftListRoomViewFrom();

                    CommonPage.Instance.AddLeftView(roomManagement);

                }
                return roomManagement;
@@ -52,6 +52,10 @@
        /// 卡片控件集合

        /// </summary>

        private Dictionary<string, Controls.ListRoomCardControl> dicCardControl = new Dictionary<string, Controls.ListRoomCardControl>();

        /// <summary>

        /// 未分配界面(用于对应别人乱搞,在打开未分配界面不关时,去刷新场景,然后提bug说没有场景)

        /// </summary>

        private UnallocatedRoomForm unalloctedRoom = null;



        #endregion



@@ -60,7 +64,7 @@
        /// <summary>
        /// 画面显示
        /// </summary>
        public void ShowForm()
        private void ShowForm()
        {

            //初始化头部信息
            this.InitTopFrame();
@@ -92,13 +96,18 @@
            };



            //获取楼层

            this.curFloorId = Config.Instance.Home.CurrentFloorId;



            var dicFloor = HdlRoomLogic.Current.GetFloorSortList();

            if (dicFloor.Count == 0)

            {

                return;

            }

            //楼层初始ID

            foreach (var floorId in dicFloor.Keys)

            {

                this.curFloorId = floorId;

                break;

            }



            //楼层图标

            var btnIconContr = new MostRightIconControl(69, 69);

            btnIconContr.UnSelectedImagePath = "Item/Drop_Down.png";

@@ -116,9 +125,9 @@
            {

                //楼层菜单

                var floors = new Category.SelectFloorForm();

                floors.CurFloorId = this.curFloorId;

                AddChidren(floors);

                floors.changeFloor = false;

                floors.CurFloorId = curFloorId;

                floors.CurFloorId = this.curFloorId;

                floors.Init(599, 161, Direction.Right);

                floors.FloorAction += (floorId) =>

                {

@@ -152,6 +161,9 @@
        /// </summary>

        public void RefreshListRoom()

        {

            //保险起见,这里要关闭未分配界面

            this.CloseUnallocatedRoomForm();



            //如果还没有初始化完成界面的话

            if (this.isInitFinish == false)

            {

@@ -212,7 +224,6 @@
                    {

                        return;

                    }

                    string oldFloorId = Config.Instance.Home.CurrentFloorId;

                    CommonPage.Instance.CloseLeftMenu();



                    HdlThreadLogic.Current.RunThread(() =>

@@ -224,10 +235,11 @@
                            //点击的是收藏房间的话,不变更当前楼层id

                            if (room.FloorId != string.Empty)

                            {

                                Config.Instance.Home.CurrentFloorId = room.FloorId;

                                if (oldFloorId != room.FloorId)

                                if (Config.Instance.Home.CurrentFloorId != room.FloorId)

                                {

                                    //楼层都切换的话,刷新整个主页

                                    Config.Instance.Home.CurrentFloorId = room.FloorId;

                                    HdlRoomLogic.Current.NowMainPageRoom = room;

                                    UserPage.Instance.ReFreshControl();

                                    return;

                                }

@@ -295,14 +307,33 @@
                    return;

                }

                //未分配

                var unalloctedRoom = new UnallocatedRoomForm();

                this.unalloctedRoom = new UnallocatedRoomForm();

                this.AddChidren(unalloctedRoom);

                unalloctedRoom.ShowForm();

                unalloctedRoom.FormCloseEvent += () =>

                {

                    //手动点击关闭的话,直接置空

                    this.unalloctedRoom = null;

                };

            };

        }



        #endregion



        #region ■ 关闭未分配界面_____________________



        /// <summary>

        /// 关闭未分配界面

        /// </summary>

        public void CloseUnallocatedRoomForm()

        {

            //关闭界面

            this.unalloctedRoom?.CloseForm();

            this.unalloctedRoom = null;

        }



        #endregion



        #region ■ 刷新指定房间_______________________



        /// <summary>