备份

xm

2020-07-10 acb2b278663952ce555b06a2e821f359225f15e0

 ZigbeeApp/Shared/Phone/MainPage/HomeMainPageForm.cs

old mode 100755
new mode 100644
@@ -16,6 +16,10 @@
        #region ■ 变量声明___________________________



        /// <summary>

        /// The instance.

        /// </summary>

        public static HomeMainPageForm Instance;

        /// <summary>

        /// 整个界面的上下滑动控件

        /// </summary>

        private VerticalFrameControl listBodyContr = null;

@@ -49,7 +53,10 @@
        /// </summary>

        public void ShowForm()

        {

            //先初始化左滑房间列表界面(在反射里面初始化)

            this.FormID = "HomeMainPageForm";

            Instance = this;

            //先初始化左滑房间列表界面(在反射里面初始化)
            if (ListRoomViewFrom.Instance == null) { }



            //整个背景的上下滑动控件

@@ -75,8 +82,6 @@
            this.AddNormalDeviceReportEvent();

            //添加传感器状态上报事件

            this.AddSensorDeviceReportEvent();

            //将当前的画面保存到内存当中

            UserCenterLogic.AddActionForm(this);

        }



        /// <summary>

@@ -85,7 +90,7 @@
        private void InitTopFrameLayoutControl()

        {

            //头部容器

            base.topFrameLayout = new FrameLayout();

            base.topFrameLayout = new NormalFrameLayout();

            topFrameLayout.Y = Application.GetRealHeight(60);

            topFrameLayout.Height = Application.GetRealHeight(127);

            topFrameLayout.BackgroundColor = ZigbeeColor.Current.GXCGrayBackgroundColor;

@@ -165,7 +170,7 @@
                    selectHouse.Init();

                    selectHouse.HouseAction = (houseId) =>

                    {

                        ChangeResidence(House.GetHouseByHouseId(houseId));

                        ChangeResidence(HdlResidenceLogic.Current.GetHouseByHouseId(houseId));

                    };

                }

            };

@@ -250,7 +255,7 @@
            }



            //功能和场景bodyView

            this.bodyFrameLayout = new FrameLayout();

            this.bodyFrameLayout = new NormalFrameLayout();

            bodyFrameLayout.Y = functionSceneView.Bottom;

            bodyFrameLayout.Height = this.listBodyContr.frameTable.Height - functionSceneView.Bottom;

            bodyFrameLayout.BackgroundColor = ZigbeeColor.Current.GXCGrayBackgroundColor;

@@ -538,8 +543,9 @@


            var listDevice = new List<CommonDevice>();

            foreach (var mainkeys in HdlRoomLogic.Current.NowMainPageRoom.ListDevice)

            {

            {
                var device = LocalDevice.Current.GetDevice(mainkeys);



                //判断该设备能否显示在主页

                if (LocalDevice.Current.CanShowInHomeHomeMainPage(device) == false)

                {

@@ -634,6 +640,11 @@
                    else if (device.Type == DeviceType.DoorLock)

                    {

                        cardContr = new Controls.DeviceDoorLockCardControl();

                    }

                    //色温灯

                    else if (device.Type == DeviceType.ColorTemperatureLight)

                    {

                        cardContr = new Controls.DeviceColorTemperatureCardControl();

                    }

                    //无法识别

                    else

@@ -1051,7 +1062,7 @@
                new System.Threading.Thread(async () =>

                {

                    Config.Instance.HomeId = home.Id;

                    Config.Instance.Home = House.GetHouseByFilePath(home.FileName);

                    Config.Instance.Home = HdlResidenceLogic.Current.GetHouseByHouseId(home.Id);

                    Global.CreateHomeDirectory(home.Id);

                    Config.Instance.Save();

                    //刷新个人中心的内存及线程

@@ -1166,7 +1177,7 @@
            floorFL.changeFloor = true;

            floorFL.FloorAction = (floorId) =>

            {

                btnFloor.Text = Config.Instance.Home.GetFloorNameById(floorId);

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

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

                this.ShowForm();

            };

@@ -1181,8 +1192,10 @@
        /// </summary>

        public override void CloseFormBefore()

        {

            //把静态变量的这个东西置空

            Instance = null;



            HdlGatewayReceiveLogic.Current.RemoveEvent("UserHomeViewDeviceOnline");

            HdlGatewayReceiveLogic.Current.RemoveEvent("UserHomeViewDeviceRespone");

            HdlGatewayReceiveLogic.Current.RemoveEvent("UserHomeViewDeviceStatus");

            HdlGatewayReceiveLogic.Current.RemoveEvent("UserHomeViewSensor");