新版本

黄学彪

2020-07-13 23420922845c9e77019a55c3b3e3271eb1ec261e

 ZigbeeApp/Shared/Phone/Category/CategoryMainForm.cs

@@ -152,18 +152,21 @@
                btnFloorName.Y = Application.GetRealHeight(17);

                btnFloorName.TextAlignment = TextAlignment.CenterRight;

                btnFloorName.IsBold = true;

                btnFloorName.Text = HdlResidenceLogic.Current.GetFloorNameById(Config.Instance.Home.CurrentFloorId);

                btnFloorName.Text = Common.Config.Instance.Home.GetCurrentFloorName;

                frameSwitchBack.AddChidren(btnFloorName);

                btnFloorName.ButtonClickEvent += (sender, e) =>

                {

                    var floors = new SelectFloorForm();

                    floors.CurFloorId = Config.Instance.Home.CurrentFloorId;

                    AddChidren(floors);

                    floors.Init(580, 330, Direction.Right);

                    floors.changeFloor = true;

                    floors.FloorAction += (floorId) =>

                    {

                        btnFloorName.Text = HdlResidenceLogic.Current.GetFloorNameById(floorId);

                        Config.Instance.Home.CurrentFloorId = floorId;

                        HdlRoomLogic.Current.NowCategoryRoom = HdlRoomLogic.Current.GetLoveRoom();

                        //这个时候需要刷新主页

                        UserPage.Instance.RefreshMainPageForm = true;

                        //刷新bodyView

                        this.RefreshBodyView();

                    };

@@ -277,7 +280,7 @@
        private void InitRoomMenuControl()

        {

            //当前楼层的全部房间

            var lisrRoom = HdlRoomLogic.Current.GetRoomsByCurrentFloorIdAppendLoveRoom();

            var lisrRoom = HdlRoomLogic.Current.GetRoomsByFloorIdAppendLoveRoom(Config.Instance.Home.CurrentFloorId);

            if (HdlRoomLogic.Current.NowCategoryRoom == null)

            {

                //设置第一个为初始房间

@@ -633,12 +636,13 @@
                        HdlThreadLogic.Current.RunMain(() =>

                        {

                            listview1.EndHeaderRefreshing();

                            if (result == true)

                            //listview1.Parent为null代表它切换房间了

                            if (result == true && listview1.Parent != null)

                            {

                                //在外面清空(特效的问题)

                                this.functionSceneBodyView.RemoveAll();

                                //刷新场景的时候,关闭左划菜单的未分配界面

                                MainPage.LeftListRoomViewFrom.Instance?.CloseUnallocatedRoomForm();

                                //在外面清空(特效的问题)

                                this.functionSceneBodyView.RemoveAll();



                                HdlThreadLogic.Current.RunMainInThread(() =>

                                {

@@ -820,7 +824,11 @@
                        //已经接收到网关的反馈 2020.05.09:删除Ack主题

                        this.dicDeviceRowControl[mainKeys].SetHadGetResponeResultStatu();

                        //刷新控件

                        this.dicDeviceRowControl[mainKeys].RefreshControlInfo(locadevice);

                        if (locadevice.Type != DeviceType.IASZone)

                        {

                            //传感器不需要属性上报(但是那个球型传感器居然会属性上报)

                            this.dicDeviceRowControl[mainKeys].RefreshControlInfo(locadevice);

                        }

                    }

                }, ShowErrorMode.NO);

            });