From 25429f085093d89d543a0b90e30d0d62d1b7dac9 Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期二, 30 八月 2022 09:37:38 +0800
Subject: [PATCH] 合并了IOS的代码
---
ZigbeeApp/Shared/Phone/MainPage/HomeMainPageForm.cs | 183 +++++++++++++++++++++++++++++++++++++++------
1 files changed, 159 insertions(+), 24 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/MainPage/HomeMainPageForm.cs b/ZigbeeApp/Shared/Phone/MainPage/HomeMainPageForm.cs
old mode 100755
new mode 100644
index bd885f9..ae83791
--- 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();
//鍒濆鍖栦腑闂存帶浠�
@@ -87,6 +84,8 @@
this.AddSensorDeviceReportEvent();
//寮�鍚紶鎰熷櫒鐘舵�佽繕鍘熺殑绾跨▼
this.StartRecoverSenorStatuThread();
+ //鏄剧ずApp鍏憡
+ this.ShowAppNotice();
}
/// <summary>
@@ -324,7 +323,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;
@@ -332,13 +331,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);
@@ -349,7 +348,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;
@@ -633,6 +632,11 @@
{
cardContr = new Controls.DevicePmSensorCardControl();
}
+ // 鏅捐。鏋�
+ else if (device.Type == DeviceType.Airer)
+ {
+ cardContr = new Controls.DeviceAirerCardControl();
+ }
//褰╃伅(璋冨厜鍣�)
else if (device.Type == DeviceType.DimmableLight)
{
@@ -646,7 +650,17 @@
//娓╂箍搴�
else if (device.Type == DeviceType.TemperatureSensor)
{
- cardContr = new Controls.DeviceTemperatureCardControl();
+ //绌烘皵璐ㄩ噺浼犳劅鍣�
+ //鑾峰彇璁惧绫诲瀷
+ var deviceEnumInfo = Common.LocalDevice.Current.GetMyDeviceEnumInfo(new List<CommonDevice>() { device });
+ if (deviceEnumInfo.ConcreteType == Common.DeviceConcreteType.AirQualitySensor)
+ {
+ cardContr = new Controls.DeviceAirQualitySensorCardControl();
+ }
+ else
+ {
+ cardContr = new Controls.DeviceTemperatureCardControl();
+ }
}
//闂ㄩ攣
else if (device.Type == DeviceType.DoorLock)
@@ -659,7 +673,7 @@
cardContr = new Controls.DeviceColorTemperatureCardControl();
}
//鏃犳硶璇嗗埆
- else
+ if (cardContr == null)
{
cardContr = new Controls.DeviceCardCommon();
}
@@ -700,17 +714,38 @@
}
HdlThreadLogic.Current.RunThread(() =>
{
- for (int i = 0; i < listContr.Count; i++)
+ int sendCount = 0;
+ 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(300);
+ }
}
- System.Threading.Thread.Sleep(200);
- //鍙戦�佽幏鍙栫姸鎬佺殑鍛戒护
- listContr[i].SendStatuComand();
+ if (hadSend == false)
+ {
+ //濡傛灉宸茬粡鍏ㄩ儴鍥炶矾閮芥帴鏀朵簡缃戝叧鍥炲,鍒欎笉鍐嶄簩娆″彂閫�
+ break;
+ }
+ sendCount++;
+ if (sendCount == 2)
+ {
+ //灏卞彂2娆�
+ break;
+ }
+ System.Threading.Thread.Sleep(5000);
}
-
}, ShowErrorMode.NO);
}
});
@@ -1103,6 +1138,18 @@
{
//澶勭悊涓�鑸澶囩殑涓婃姤鏁版嵁
string mainKeys = LocalDevice.Current.GetDeviceMainKeys(report);
+
+ //鏅捐。鏋朵笂鎶ラ渶瑕佺壒娈婂鐞嗭紝鍏朵粬涓婃姤鐨勫洖璺粺涓�杞负绔偣1
+ var tempList = LocalDevice.Current.GetDevicesByMac(report.DeviceAddr);
+ if (tempList.Count > 0)
+ {
+ var tempDeviceEnum = LocalDevice.Current.GetMyDeviceEnumInfo(tempList);
+ if (tempDeviceEnum.ConcreteType == Common.DeviceConcreteType.Airer)
+ {
+ mainKeys = report.DeviceAddr + "_" + 1;
+ }
+ }
+
if (this.dicDeviceCardControl.ContainsKey(mainKeys) == true)
{
//鍒锋柊鍗＄墖淇℃伅
@@ -1195,6 +1242,8 @@
//璁惧鐘舵�佸繀椤诲埛鏂�
string statuText = HdlDeviceOtherLogic.Current.GetDeviceStatu(contr.device);
contr.SetDeviceStatuText(statuText);
+ //浼犳劅鍣ㄥ垏鎹负鐏拌壊鐘舵��
+ contr.SwitchCardStatuAppeal(false);
}, ShowErrorMode.NO);
}
@@ -1268,19 +1317,105 @@
}
/// <summary>
- /// 鍒濆鍖栭粯璁ゆゼ灞侷D
+ /// 鏄剧ずApp鍏憡
/// </summary>
- private void InitDefultFloorId()
+ private void ShowAppNotice()
{
- if (Config.Instance.Home.CurrentFloorId != string.Empty)
+ HdlThreadLogic.Current.RunThread(() =>
{
+ if (HdlFirmwareUpdateLogic.CheckCanShowNotice() == true)
+ {
+ while (this.IsFormOpen("HdlAutoBackupForm") == true)
+ {
+ //鑷姩澶囦唤鐨勭晫闈㈡鍦ㄦ墦寮�涓�
+ System.Threading.Thread.Sleep(1000);
+ }
+ HdlThreadLogic.Current.RunMain(() =>
+ {
+ //鍔犺浇绯荤粺鍏憡
+ var form2 = new AppNoticeForm();
+ UserView.UserPage.Instance.AddChidren(form2);
+ form2.Show();
+ form2.FinishEvent += () =>
+ {
+ HdlThreadLogic.Current.RunThread(() =>
+ {
+ System.Threading.Thread.Sleep(1000);
+ //鏄剧ずApp鍗囩骇鐨勫脊绐�
+ this.ShowUpdateAppDialog();
+
+ }, ShowErrorMode.NO);
+ };
+
+ }, ShowErrorMode.NO);
+ }
+ else
+ {
+ //鏄剧ずApp鍗囩骇鐨勫脊绐�
+ this.ShowUpdateAppDialog();
+ }
+ }, ShowErrorMode.NO);
+ }
+
+ /// <summary>
+ /// 鏄剧ずApp鍗囩骇鐨勫脊绐�
+ /// </summary>
+ private void ShowUpdateAppDialog()
+ {
+ //App鍗囩骇鎻愮ず
+ if (string.IsNullOrEmpty(FirmwareUpdateResourse.AppNeedUpdateUrl) == false)
+ {
+ //鏁翠簡涓�娆′箣鍚庡氨涓嶆暣浜�
+ string updateUrl = FirmwareUpdateResourse.AppNeedUpdateUrl;
+ FirmwareUpdateResourse.AppNeedUpdateUrl = string.Empty;
+
+ while (this.IsFormOpen("HdlAutoBackupForm") == true)
+ {
+ //鑷姩澶囦唤鐨勭晫闈㈡鍦ㄦ墦寮�涓�
+ System.Threading.Thread.Sleep(1000);
+ }
+ //鍙戠幇APP鏂扮増鏈�,椹笂鍗囩骇{0}寮�鍚柊浣撻獙鍝
+ this.ShowMassage(ShowMsgType.Confirm, Language.StringByID(R.MyInternationalizationString.uAppUpdateMsg1).Replace("{0}", "\r\n"), () =>
+ {
+#if iOS
+ Uri url = new Uri(updateUrl);
+ UIKit.UIApplication.SharedApplication.OpenUrl(url);
+#endif
+#if Android
+ HDLUtils.OpenUrl(updateUrl);
+#endif
+ }, Language.StringByID(R.MyInternationalizationString.uLevelUp));
+ //App鍗囩骇鎻愮ず浼樺厛
return;
}
- var dicFloor = HdlRoomLogic.Current.GetFloorSortList();
- foreach (var floorId in dicFloor.Keys)
+ //缃戝叧鍗囩骇鎻愮ず
+ if (FirmwareUpdateResourse.ListGatewayNeedUpdate.Count > 0)
{
- Config.Instance.Home.CurrentFloorId = floorId;
- break;
+ //鏁村畬涔嬪悗灏辨竻绌�
+ var listGateway = new List<string>();
+ listGateway.AddRange(FirmwareUpdateResourse.ListGatewayNeedUpdate);
+ FirmwareUpdateResourse.ListGatewayNeedUpdate = new List<string>();
+
+ while (this.IsFormOpen("HdlAutoBackupForm") == true)
+ {
+ //鑷姩澶囦唤鐨勭晫闈㈡鍦ㄦ墦寮�涓�
+ System.Threading.Thread.Sleep(1000);
+ }
+ foreach (var gwId in listGateway)
+ {
+ //鐩墠鍙暣涓�涓�
+ if (HdlGatewayLogic.Current.IsGatewayExist(gwId) == true)
+ {
+ //鍙戠幇缃戝叧鏂扮増鏈�,椹笂鍗囩骇{0}寮�鍚柊浣撻獙鍝
+ this.ShowMassage(ShowMsgType.Confirm, Language.StringByID(R.MyInternationalizationString.uGatewayUpdateMsg1).Replace("{0}", "\r\n"), () =>
+ {
+ var form = new UserCenter.GatewayUpdate.GatewayFirmwareUpdateForm();
+ form.AddForm(HdlGatewayLogic.Current.GetLocalGateway(gwId));
+ });
+ break;
+ }
+ }
+ return;
}
}
@@ -1297,6 +1432,6 @@
return 1;
}
- #endregion
+#endregion
}
}
--
Gitblit v1.8.0