From c7df85937f73fb347ee0b19e9c052d2d00a6df6c Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期五, 18 九月 2020 13:58:19 +0800
Subject: [PATCH] 新版本
---
ZigbeeApp/Shared/Phone/MainPage/HomeMainPageForm.cs | 109 +++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 74 insertions(+), 35 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/MainPage/HomeMainPageForm.cs b/ZigbeeApp/Shared/Phone/MainPage/HomeMainPageForm.cs
index f28273d..549615c 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>
@@ -322,7 +321,7 @@
this.listBodyContr.frameTable.AddChidren(bg);
var tip = new NormalViewControl(this.GetPictrueRealSize(717), this.GetPictrueRealSize(58), false);
- tip.Y = Application.GetRealHeight(815);
+ tip.Y = bg.Bottom + Application.GetRealHeight(35);
tip.Gravity = Gravity.CenterHorizontal;
tip.TextID = R.MyInternationalizationString.NewAccountNeedBingGW;
tip.TextColor = ZigbeeColor.Current.GXCTextGrayColor;
@@ -330,13 +329,13 @@
this.listBodyContr.frameTable.AddChidren(tip);
var addBG = new PicViewControl(971, 366);
- addBG.Y = Application.GetRealHeight(1048);
+ addBG.Y = tip.Bottom + Application.GetRealHeight(176);
addBG.UnSelectedImagePath = "Item/VirtualFrame.png";
addBG.Gravity = Gravity.CenterHorizontal;
this.listBodyContr.frameTable.AddChidren(addBG);
var addGatewayBtn = new IconViewControl(89);
- addGatewayBtn.Y = Application.GetRealHeight(1143);
+ addGatewayBtn.Y = tip.Bottom + Application.GetRealHeight(271);
addGatewayBtn.UnSelectedImagePath = "Item/Add_GW.png";
addGatewayBtn.Gravity = Gravity.CenterHorizontal;
this.listBodyContr.frameTable.AddChidren(addGatewayBtn);
@@ -347,7 +346,7 @@
};
var addTip = new PicViewControl(717, 58);
- addTip.Y = Application.GetRealHeight(1256);
+ addTip.Y = addGatewayBtn.Bottom + Application.GetRealHeight(23);
addTip.Gravity = Gravity.CenterHorizontal;
addTip.TextID = R.MyInternationalizationString.AddSmartGW;
addTip.TextColor = ZigbeeColor.Current.GXCTextBlackColor;
@@ -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)
{
@@ -693,17 +697,31 @@
}
HdlThreadLogic.Current.RunThread(() =>
{
- for (int i = 0; i < listContr.Count; i++)
+ while (listDeviceBackContr.Parent != null)
{
- if (listDeviceBackContr.Parent == null)
+ bool hadSend = false;
+ for (int i = 0; i < listContr.Count; i++)
{
- return;
+ if (listDeviceBackContr.Parent == null)
+ {
+ return;
+ }
+ //濡傛灉杩樻病鏈夋帴鏀跺埌鏁版嵁,鍒欏啀娆″彂閫�
+ if (listContr[i].ReceiveResponeResultStatu() == false)
+ {
+ //鍙戦�佽幏鍙栫姸鎬佺殑鍛戒护
+ listContr[i].SendStatuComand();
+ hadSend = true;
+ System.Threading.Thread.Sleep(200);
+ }
}
- System.Threading.Thread.Sleep(200);
- //鍙戦�佽幏鍙栫姸鎬佺殑鍛戒护
- listContr[i].SendStatuComand();
+ if (hadSend == false)
+ {
+ //濡傛灉宸茬粡鍏ㄩ儴鍥炶矾閮芥帴鏀朵簡缃戝叧鍥炲,鍒欎笉鍐嶄簩娆″彂閫�
+ break;
+ }
+ System.Threading.Thread.Sleep(2000);
}
-
}, ShowErrorMode.NO);
}
});
@@ -1066,13 +1084,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 +1183,42 @@
#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);
+ //浼犳劅鍣ㄥ垏鎹负鐏拌壊鐘舵��
+ contr.SwitchCardStatuAppeal(false);
+
+ }, ShowErrorMode.NO);
+ }
+ }
+ System.Threading.Thread.Sleep(8000);
+ }
+ catch { System.Threading.Thread.Sleep(3000); }
+ }
+ });
+ }
+
#endregion
#region 鈻� 鍒囨崲妤煎眰___________________________
@@ -1222,23 +1278,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