From a7ab4b610972e20753dfedb3e5d80e4d9f017d07 Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期五, 14 八月 2020 10:39:08 +0800
Subject: [PATCH] 临时备份，测试1
---
ZigbeeApp/Shared/Phone/MainPage/HomeMainPageForm.cs | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/MainPage/HomeMainPageForm.cs b/ZigbeeApp/Shared/Phone/MainPage/HomeMainPageForm.cs
index 636fc83..bd885f9 100755
--- a/ZigbeeApp/Shared/Phone/MainPage/HomeMainPageForm.cs
+++ b/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();
});
});
--
Gitblit v1.8.0