去掉了访问外网的异步

黄学彪

2020-07-06 f23ad1b3f9f6193f35f72104d690b21dc67d5c1f

 ZigbeeApp/Shared/Phone/MainPage/HomeMainPageForm.cs

@@ -16,6 +16,10 @@
        #region ■ 变量声明___________________________



        /// <summary>

        /// The instance.

        /// </summary>

        public static HomeMainPageForm Instance;

        /// <summary>

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

        /// </summary>

        private VerticalFrameControl listBodyContr = null;

@@ -49,6 +53,9 @@
        /// </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,8 @@
                    selectHouse.Init();

                    selectHouse.HouseAction = (houseId) =>

                    {

                        ChangeResidence(House.GetHouseByHouseId(houseId));

                        //切换住宅

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

                    };

                }

            };

@@ -250,7 +256,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;

@@ -398,6 +404,11 @@


            //当前房间

            var listRoom = HdlRoomLogic.Current.GetRoomsByCurrentFloorIdAppendLoveRoom();

            if (HdlRoomLogic.Current.NowMainPageRoom == null)

            {

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

                HdlRoomLogic.Current.NowMainPageRoom = listRoom[0];

            }

            var curIndex = 0;

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

            {

@@ -405,7 +416,7 @@
                roomPageView.AddChidren(roomView);

                roomView.Init(listRoom[i]);



                if (listRoom[i].Id == HdlRoomLogic.Current.CurrentRoom.Id)

                if (listRoom[i].Id == HdlRoomLogic.Current.NowMainPageRoom.Id)

                {

                    //当前房间,则显示那些数据出来

                    roomView.HideName(false);

@@ -470,7 +481,7 @@
                btnRoomRightShadow.Visible = true;

                btnRoomBottomShadow.Visible = true;

                //切换当前房间

                HdlRoomLogic.Current.CurrentRoom = listRoom[curIndex];

                HdlRoomLogic.Current.NowMainPageRoom = listRoom[curIndex];

                //刷新设备桌布控件

                this.isRoomChanging = false;

                this.RefreshBodyView();

@@ -532,7 +543,7 @@
            this.dicDeviceCardControl.Clear();



            var listDevice = new List<CommonDevice>();

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

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

            {

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

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

@@ -630,6 +641,11 @@
                    {

                        cardContr = new Controls.DeviceDoorLockCardControl();

                    }

                    //色温灯

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

                    {

                        cardContr = new Controls.DeviceColorTemperatureCardControl();

                    }

                    //无法识别

                    else

                    {

@@ -640,7 +656,7 @@
                    cardContr.X = XX;

                    cardContr.Y = YY;

                    listDeviceBackContr.AddChidren(cardContr);

                    cardContr.InitControl(device);

                    cardContr.InitControl(device, HdlRoomLogic.Current.NowMainPageRoom);

                    //卡片需要被移除的事件

                    cardContr.CardNeedRemoveEvent += () =>

                    {

@@ -787,7 +803,7 @@
            this.dicDeviceCardControl.Clear();



            var listScene = new List<SceneUI>();

            foreach (int sceneId in HdlRoomLogic.Current.CurrentRoom.ListSceneId)

            foreach (int sceneId in HdlRoomLogic.Current.NowMainPageRoom.ListSceneId)

            {

                var sceneUi = HdlSceneLogic.Current.GetSceneUIBySceneId(sceneId);

                if (sceneUi == null)

@@ -1040,36 +1056,21 @@
        /// <param name="home">Home.</param>

        private void ChangeResidence(House home)

        {

            try

            HdlThreadLogic.Current.RunThread(() =>

            {

                CommonPage.Loading.Start();

                new System.Threading.Thread(async () =>

                {

                    Config.Instance.HomeId = home.Id;

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

                    Global.CreateHomeDirectory(home.Id);

                    Config.Instance.Save();

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

                    await UserCenterLogic.InitUserCenterMenmoryAndThread();

                this.ShowProgressBar();



                    Application.RunOnMainThread(() =>

                    {

                        //刷新界面

                        this.ShowForm();

                //切换住宅

                HdlResidenceLogic.Current.SwitchResidence(home.Id);



                        CommonPage.Loading.Hide();

                    });

                })

                { IsBackground = true }.Start();

            }

            catch (Exception ex)

            {

                Application.RunOnMainThread(() =>

                HdlThreadLogic.Current.RunMain(() =>

                {

                    CommonPage.Loading.Hide();

                    Console.WriteLine(ex.Message);

                    //刷新界面

                    this.ShowForm();



                    this.CloseProgressBar();

                });

            }

            });

        }



        #endregion

@@ -1136,10 +1137,8 @@
                    string mainKeys = LocalDevice.Current.GetDeviceMainKeys(report);

                    if (this.dicDeviceCardControl.ContainsKey(mainKeys) == true)

                    {

                        //本地设备对象

                        var locadevice = LocalDevice.Current.GetDevice(mainKeys);

                        //刷新卡片信息

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

                        //开启卡片闪烁特效

                        this.dicDeviceCardControl[mainKeys].StartCardLightAppeal();

                    }



                }, ShowErrorMode.NO);

@@ -1161,8 +1160,8 @@
            floorFL.changeFloor = true;

            floorFL.FloorAction = (floorId) =>

            {

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

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

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

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

                this.ShowForm();

            };

        }

@@ -1176,8 +1175,10 @@
        /// </summary>

        public override void CloseFormBefore()

        {

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

            Instance = null;



            HdlGatewayReceiveLogic.Current.RemoveEvent("UserHomeViewDeviceOnline");

            HdlGatewayReceiveLogic.Current.RemoveEvent("UserHomeViewDeviceRespone");

            HdlGatewayReceiveLogic.Current.RemoveEvent("UserHomeViewDeviceStatus");

            HdlGatewayReceiveLogic.Current.RemoveEvent("UserHomeViewSensor");