From 9f326f4000847e6167d8166fa2f6a66f53cb3734 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 17 十二月 2020 09:07:13 +0800
Subject: [PATCH] 新云端Ver1.3
---
ZigbeeApp/Shared/Phone/MainPage/HomeMainPageForm.cs | 157 +++++++++++++++++++++++++++++++++-------------------
1 files changed, 100 insertions(+), 57 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/MainPage/HomeMainPageForm.cs b/ZigbeeApp/Shared/Phone/MainPage/HomeMainPageForm.cs
index 4e2b13b..726e76a 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>
@@ -101,7 +100,7 @@
//妤煎眰鍥炬爣
var btnFloorIcon = new IconViewControl(69);
- btnFloorIcon.X = ControlCommonResourse.XXLeft;
+ btnFloorIcon.X = HdlControlResourse.XXLeft;
btnFloorIcon.Gravity = Gravity.CenterVertical;
btnFloorIcon.UnSelectedImagePath = "Item/Floor.png";
topFrameLayout.AddChidren(btnFloorIcon);
@@ -136,7 +135,7 @@
//鍙瀵硅蹇嵎鏂瑰紡
Shared.Phone.Device.VideoIntercom.VideoMachine.AccountSupportVideo(topFrameLayout);
//瀹夐槻蹇嵎鏂瑰紡
- if (UserCenterResourse.ResidenceOption.SafetyShortcut)
+ if (HdlUserCenterResourse.ResidenceOption.SafetyShortcut)
{
var btnSafety = new Controls.SafetyShortcutControl();
btnSafety.X = Application.GetRealWidth(860);
@@ -153,7 +152,7 @@
//浣忓畢鍚嶅瓧
var btnHouseName = new NormalViewControl(700, 95, true);
- btnHouseName.X = ControlCommonResourse.XXLeft;
+ btnHouseName.X = HdlControlResourse.XXLeft;
btnHouseName.Y = Application.GetRealHeight(161);
btnHouseName.TextSize = 24;
btnHouseName.TextColor = ZigbeeColor.Current.GXCTextDeepBlackColor;
@@ -189,7 +188,7 @@
private void InitMidFrameLayoutControl()
{
//鎴愬憳韬唤涓嶅厑璁告坊鍔犵綉鍏�
- if (UserCenterResourse.UserInfo.AuthorityNo == 3)
+ if (HdlUserCenterResourse.ResidenceOption.AuthorityNo == 3)
{
//鍒濆鍖栧満鏅�,鍔熻兘鐨勫垏鎹㈡帶浠�
this.InitSceneFunctionSwitchControl();
@@ -248,13 +247,13 @@
btnFunction.TextID = R.MyInternationalizationString.Function;
btnFunction.TextAlignment = TextAlignment.Center;
functionSceneView.AddChidren(btnFunction);
- if (UserCenterResourse.ResidenceOption.HomeMainPageSwitchIndex == 1)
+ if (HdlUserCenterResourse.ResidenceOption.HomeMainPageSwitchIndex == 1)
{
btnScene.IsSelected = true;
btnScene.TextSize = 17;
btnScene.IsBold = true;
}
- else if (UserCenterResourse.ResidenceOption.HomeMainPageSwitchIndex == 2)
+ else if (HdlUserCenterResourse.ResidenceOption.HomeMainPageSwitchIndex == 2)
{
btnFunction.IsSelected = true;
btnFunction.TextSize = 17;
@@ -276,7 +275,7 @@
return;
}
//鍔熻兘鍒嗘敮閫夋嫨
- UserCenterResourse.ResidenceOption.HomeMainPageSwitchIndex = 2;
+ HdlUserCenterResourse.ResidenceOption.HomeMainPageSwitchIndex = 2;
btnScene.IsSelected = false;
btnScene.TextSize = 15;
@@ -296,7 +295,7 @@
return;
}
//鍦烘櫙鍒嗘敮閫夋嫨
- UserCenterResourse.ResidenceOption.HomeMainPageSwitchIndex = 1;
+ HdlUserCenterResourse.ResidenceOption.HomeMainPageSwitchIndex = 1;
btnScene.IsSelected = true;
btnScene.TextSize = 17;
@@ -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;
@@ -544,15 +543,15 @@
bodyFrameLayout.RemoveAll();
bodyFrameLayout.Height = Application.GetRealHeight(750);
this.listBodyContr.RecoverTableHeight();
- this.dicSceneCardControl.Clear();
- this.dicDeviceCardControl.Clear();
+ this.dicSceneCardControl = new Dictionary<int, Controls.SceneCardControl>();
+ this.dicDeviceCardControl = new Dictionary<string, Controls.DeviceCardCommon>();
var listDevice = new List<CommonDevice>();
foreach (var mainkeys in HdlRoomLogic.Current.NowMainPageRoom.ListDevice)
{
- var device = LocalDevice.Current.GetDevice(mainkeys);
+ var device = HdlDeviceCommonLogic.Current.GetDevice(mainkeys);
//鍒ゆ柇璇ヨ澶囪兘鍚︽樉绀哄湪涓婚〉
- if (LocalDevice.Current.CanShowInHomeHomeMainPage(device) == false)
+ if (HdlDeviceCommonLogic.Current.CanShowInHomeHomeMainPage(device) == false)
{
continue;
}
@@ -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)
{
@@ -666,7 +670,7 @@
cardContr.CardNeedRemoveEvent += () =>
{
//閲嶇疆璁惧鍗＄墖鎺т欢鍧愭爣(鍗＄墖闇�瑕佽鍒犻櫎涓撶敤)
- this.ResetDeviceCardControlLocation(LocalDevice.Current.GetDeviceMainKeys(device));
+ this.ResetDeviceCardControlLocation(HdlDeviceCommonLogic.Current.GetDeviceMainKeys(device));
};
//璁惧璁℃暟
contrCount++;
@@ -678,7 +682,7 @@
YY = cardContr.Bottom + this.GetPictrueRealSize(15);
}
//鎺т欢璁板綍鍒扮紦瀛樹腑
- this.dicDeviceCardControl[LocalDevice.Current.GetDeviceMainKeys(device)] = cardContr;
+ this.dicDeviceCardControl[HdlDeviceCommonLogic.Current.GetDeviceMainKeys(device)] = cardContr;
//鍔犵紦瀛�,鐒跺悗鍙戝懡浠�
listContr.Add(cardContr);
@@ -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);
}
});
@@ -804,8 +822,8 @@
bodyFrameLayout.RemoveAll();
bodyFrameLayout.Height = Application.GetRealHeight(750);
this.listBodyContr.RecoverTableHeight();
- this.dicSceneCardControl.Clear();
- this.dicDeviceCardControl.Clear();
+ this.dicSceneCardControl = new Dictionary<int, Controls.SceneCardControl>();
+ this.dicDeviceCardControl = new Dictionary<string, Controls.DeviceCardCommon>();
var listScene = new List<SceneUI>();
foreach (int sceneId in HdlRoomLogic.Current.NowMainPageRoom.ListSceneId)
@@ -1039,7 +1057,7 @@
//璁╃晫闈㈠埆闂儊
HdlThreadLogic.Current.RunMainInThread(() =>
{
- if (UserCenterResourse.ResidenceOption.HomeMainPageSwitchIndex == 2)
+ if (HdlUserCenterResourse.ResidenceOption.HomeMainPageSwitchIndex == 2)
{
//鍔熻兘
this.ShowFunction();
@@ -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();
});
});
@@ -1093,11 +1113,11 @@
HdlThreadLogic.Current.RunMain(() =>
{
//澶勭悊涓�鑸澶囩殑涓婃姤鏁版嵁
- string mainKeys = LocalDevice.Current.GetDeviceMainKeys(report);
+ string mainKeys = HdlDeviceCommonLogic.Current.GetDeviceMainKeys(report);
if (this.dicDeviceCardControl.ContainsKey(mainKeys) == true)
{
//鍒锋柊鍗＄墖淇℃伅
- var locadevice = LocalDevice.Current.GetDevice(mainKeys);
+ var locadevice = HdlDeviceCommonLogic.Current.GetDevice(mainKeys);
//宸茬粡鎺ユ敹鍒扮綉鍏崇殑鍙嶉 2020.05.09:鍒犻櫎Ack涓婚
this.dicDeviceCardControl[mainKeys].SetHadGetResponeResultStatu();
//鍒锋柊鎺т欢
@@ -1120,11 +1140,11 @@
{
HdlThreadLogic.Current.RunMain(() =>
{
- string mainKeys = LocalDevice.Current.GetDeviceMainKeys(report);
+ string mainKeys = HdlDeviceCommonLogic.Current.GetDeviceMainKeys(report);
if (this.dicDeviceCardControl.ContainsKey(mainKeys) == true)
{
//鍒锋柊鍗＄墖鐘舵��
- bool bolOnline = Common.LocalDevice.Current.CheckDeviceIsOnline(report);
+ bool bolOnline = HdlDeviceCommonLogic.Current.CheckDeviceIsOnline(report);
this.dicDeviceCardControl[mainKeys].SetCardOnlineStatu(bolOnline);
return;
}
@@ -1148,7 +1168,7 @@
HdlThreadLogic.Current.RunMain(() =>
{
//澶勭悊浼犳劅鍣ㄤ笂鎶ユ暟鎹�
- string mainKeys = LocalDevice.Current.GetDeviceMainKeys(report);
+ string mainKeys = HdlDeviceCommonLogic.Current.GetDeviceMainKeys(report);
if (this.dicDeviceCardControl.ContainsKey(mainKeys) == true)
{
//寮�鍚崱鐗囬棯鐑佺壒鏁�
@@ -1156,6 +1176,46 @@
}
}, ShowErrorMode.NO);
+ });
+ }
+
+ #endregion
+
+ #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 = HdlDeviceCommonLogic.Current.GetMainPageDeviceStatuText(contr.device);
+ contr.SetDeviceStatuText(statuText);
+ //浼犳劅鍣ㄥ垏鎹负鐏拌壊鐘舵��
+ contr.SwitchCardStatuAppeal(false);
+
+ }, ShowErrorMode.NO);
+ }
+ }
+ System.Threading.Thread.Sleep(8000);
+ }
+ catch { System.Threading.Thread.Sleep(3000); }
+ }
});
}
@@ -1218,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