From 9cc8fd11b13813adbdd3c6c31554e5c0bebf4026 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期五, 21 八月 2020 19:53:49 +0800
Subject: [PATCH] 发布到商店的版本
---
ZigbeeApp/Shared/Phone/MainPage/HomeMainPageForm.cs | 71 +++++++++++++++++++++++------------
1 files changed, 47 insertions(+), 24 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/MainPage/HomeMainPageForm.cs b/ZigbeeApp/Shared/Phone/MainPage/HomeMainPageForm.cs
index f28273d..366dc9d 100755
--- a/ZigbeeApp/Shared/Phone/MainPage/HomeMainPageForm.cs
+++ b/ZigbeeApp/Shared/Phone/MainPage/HomeMainPageForm.cs
@@ -74,9 +74,6 @@
listBodyContr.RecoverTableHeight();
}
- //鍒濆鍖栭粯璁ゆゼ灞侷D
- this.InitDefultFloorId();
-
//鍒濆鍖栧ご閮ㄦ帶浠�
this.InitTopFrameLayoutControl();
//鍒濆鍖栦腑闂存帶浠�
@@ -85,6 +82,8 @@
this.AddNormalDeviceReportEvent();
//娣诲姞浼犳劅鍣ㄧ姸鎬佷笂鎶ヤ簨浠�
this.AddSensorDeviceReportEvent();
+ //寮�鍚紶鎰熷櫒鐘舵�佽繕鍘熺殑绾跨▼
+ this.StartRecoverSenorStatuThread();
}
/// <summary>
@@ -626,6 +625,11 @@
{
cardContr = new Controls.DeviceFreshAirCardControl();
}
+ // PM2.5
+ else if (device.Type == DeviceType.PMSensor)
+ {
+ cardContr = new Controls.DevicePmSensorCardControl();
+ }
//褰╃伅(璋冨厜鍣�)
else if (device.Type == DeviceType.DimmableLight)
{
@@ -1066,13 +1070,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();
});
});
@@ -1163,6 +1169,40 @@
#region 鈻� 浼犳劅鍣ㄧ姸鎬佽繕鍘焈____________________
+ /// <summary>
+ /// 寮�鍚紶鎰熷櫒鐘舵�佽繕鍘熺殑绾跨▼
+ /// </summary>
+ private void StartRecoverSenorStatuThread()
+ {
+ HdlThreadLogic.Current.RunThread(() =>
+ {
+ while (this.Parent != null)
+ {
+ try
+ {
+ var dicControl = this.dicDeviceCardControl;
+ foreach (var contr in dicControl.Values)
+ {
+ //濡傛灉鏄紶鎰熷櫒,鍒欏埛鏂扮姸鎬�
+ if (contr.device.Type == DeviceType.IASZone && contr.Parent != null
+ && ((IASZone)contr.device).iASInfo == null)
+ {
+ HdlThreadLogic.Current.RunMain(() =>
+ {
+ //璁惧鐘舵�佸繀椤诲埛鏂�
+ string statuText = HdlDeviceOtherLogic.Current.GetDeviceStatu(contr.device);
+ contr.SetDeviceStatuText(statuText);
+
+ }, ShowErrorMode.NO);
+ }
+ }
+ System.Threading.Thread.Sleep(8000);
+ }
+ catch { System.Threading.Thread.Sleep(3000); }
+ }
+ });
+ }
+
#endregion
#region 鈻� 鍒囨崲妤煎眰___________________________
@@ -1222,23 +1262,6 @@
return false;
}
return true;
- }
-
- /// <summary>
- /// 鍒濆鍖栭粯璁ゆゼ灞侷D
- /// </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
--
Gitblit v1.8.0