合并了新代码

黄学彪

2020-08-11 26d1cdf2f5246c1ad7890e6740444c4a6a80e6fb

 ZigbeeApp/Shared/Phone/MainPage/HomeMainPageForm.cs

@@ -628,6 +628,11 @@
                    {

                        cardContr = new Controls.DeviceFreshAirCardControl();

                    }

                    // PM2.5

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

                    {

                        cardContr = new Controls.DevicePmSensorCardControl();

                    }

                    //彩灯(调光器)

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

                    {

@@ -1068,13 +1073,15 @@
                this.ShowProgressBar();



                //切换住宅

                HdlResidenceLogic.Current.SwitchResidence(home.Id);

                var result = HdlResidenceLogic.Current.SwitchResidence(home.Id);



                HdlThreadLogic.Current.RunMain(() =>

                {

                    //刷新界面

                    this.ShowForm();



                    if (result == true)

                    {

                        //刷新界面

                        this.ShowForm();

                    }

                    this.CloseProgressBar();

                });

            });