新版本

黄学彪

2020-07-13 23420922845c9e77019a55c3b3e3271eb1ec261e

 ZigbeeApp/Shared/Phone/MainPage/HomeMainPageForm.cs

@@ -74,6 +74,9 @@
                listBodyContr.RecoverTableHeight();

            }



            //初始化默认楼层ID

            this.InitDefultFloorId();



            //初始化头部控件

            this.InitTopFrameLayoutControl();

            //初始化中间控件

@@ -129,6 +132,9 @@
                    this.ShowSelectFloorForm(btnFloorName);

                };

            }



            //可视对讲快捷方式

            Shared.Phone.Device.VideoIntercom.VideoMachine.AccountSupportVideo(topFrameLayout);

            //安防快捷方式

            if (UserCenterResourse.ResidenceOption.SafetyShortcut)

            {

@@ -403,10 +409,9 @@
            roomPageView.SetLeftAndRightImageView(mLeftImageView, mRightImageView);



            //当前房间

            var listRoom = HdlRoomLogic.Current.GetRoomsByCurrentFloorIdAppendLoveRoom();

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

            if (HdlRoomLogic.Current.NowMainPageRoom == null)

            {

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

                HdlRoomLogic.Current.NowMainPageRoom = listRoom[0];

            }

            var curIndex = 0;

@@ -506,7 +511,7 @@
                //当没有绑定有网关,左滑时,点击房间列表,则不鸟它

                return;

            }

            var listRoom = HdlRoomLogic.Current.GetRoomsByCurrentFloorIdAppendLoveRoom();

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

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

            {

                if (room.Id == listRoom[i].Id)

@@ -522,7 +527,7 @@
            //重置一下楼层名字

            if (this.btnFloorName != null)

            {

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

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

            }

        }



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

                        this.dicDeviceCardControl[mainKeys].SetHadGetResponeResultStatu();

                        //刷新控件

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

                        if (locadevice.Type != DeviceType.IASZone)

                        {

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

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

                        }

                    }

                }, ShowErrorMode.NO);

            });

@@ -1155,13 +1164,16 @@
        private void ShowSelectFloorForm(NormalViewControl btnFloor)

        {

            var floorFL = new Category.SelectFloorForm();

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

            this.AddChidren(floorFL);

            floorFL.Init(35, 153);

            floorFL.changeFloor = true;

            floorFL.FloorAction = (floorId) =>

            {

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

                Config.Instance.Home.CurrentFloorId = floorId;

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

                //分类界面需要刷新

                UserView.UserPage.Instance.RefreshCategoryForm = true;

                this.ShowForm();

            };

        }

@@ -1203,6 +1215,23 @@
            return true;

        }



        /// <summary>

        /// 初始化默认楼层ID

        /// </summary>

        private void InitDefultFloorId()

        {

            if (Config.Instance.Home.CurrentFloorId != string.Empty)

            {

                return;

            }

            var dicFloor = HdlRoomLogic.Current.GetFloorSortList();

            foreach (var floorId in dicFloor.Keys)

            {

                Config.Instance.Home.CurrentFloorId = floorId;

                break;

            }

        }



        #endregion



        #region ■ 界面重新激活事件___________________