From 203c3a3ffde6259413d9743f6a723b95b1e7989c Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 06 七月 2023 22:43:05 +0800
Subject: [PATCH] 门锁功能
---
HDL_ON/UI/UI2/1-HomePage/HomePage.cs | 39 ++++++++++++++++++++++++++-------------
1 files changed, 26 insertions(+), 13 deletions(-)
diff --git a/HDL_ON/UI/UI2/1-HomePage/HomePage.cs b/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
index 987ec8e..49647e1 100644
--- a/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
+++ b/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
@@ -117,6 +117,11 @@
bodyView.BackgroundColor = CSS_Color.BackgroundColor;
this.VerticalScrollBarEnabled = false;
+
+#if DEBUG
+ DB_ResidenceData.Instance.HomeGateway.isSupportGroupControl = true;
+#endif
+
#if __IOS__
//鑷姩鍋忕Щ鍙栨秷
if (UIKit.UIDevice.CurrentDevice.CheckSystemVersion(11, 0))
@@ -289,7 +294,7 @@
deviceId = enviTemp.deviceId,
attributes = new List<FunctionAttributes> { new FunctionAttributes { key = "value", state = humiAttr.state, curValue = humiAttr.curValue } },
};
- humiSensorList.Add(newTemp);
+ humiSensorList.Add(newTemp);//020103CF594C3E00051F0001051F// 1650546588519424001
}
var tempAttr = enviTemp.attributes.Find((obj) => obj.key == "temperature");
if (tempAttr != null)
@@ -301,7 +306,7 @@
deviceId = enviTemp.deviceId,
attributes = new List<FunctionAttributes> { new FunctionAttributes { key = "value", state = tempAttr.state, curValue = tempAttr.curValue } },
};
- tempSensorList.Add(newTemp);
+ tempSensorList.Add(newTemp);//020103CF594C3E00051F0001051F
}
}
@@ -359,7 +364,10 @@
foreach (var temp in tempSensorList)
{
double tempValue = 0;
- double.TryParse(temp.GetAttrState("temperature"), out tempValue);
+ if (temp.GetAttribute("temperature") != null)
+ double.TryParse(temp.GetAttrState("temperature"), out tempValue);
+ else
+ double.TryParse(temp.GetAttrState("value"), out tempValue);
if (tempValue > 0)
{
tempTotalValues += tempValue;
@@ -413,7 +421,10 @@
foreach (var humi in humiSensorList)
{
double humiValue = 0;
- double.TryParse(humi.GetAttrState("humidity"), out humiValue);
+ if (humi.GetAttribute("temperature") != null)
+ double.TryParse(humi.GetAttrState("humidity"), out humiValue);
+ else
+ double.TryParse(humi.GetAttrState("value"), out humiValue);
if (humiValue > 0)
{
humiTotalValues += humiValue;
@@ -449,7 +460,8 @@
};
btnPm25Values.Width = btnPm25Values.GetTextWidth();
environmentalView.AddChidren(btnPm25Values);
-#endregion
+ #endregion
+
btnSecurityStatus = new Button()
{
@@ -598,9 +610,9 @@
TextAlignment = TextAlignment.Center,
};
changeView.AddChidren(btnChangeScene);
-#endregion
+ #endregion
-#region ContextView
+ #region ContextView
contentView = new PageLayout()
{
//Y = changeView.Bottom,
@@ -613,7 +625,7 @@
LoadContentView();
-#endregion
+ #endregion
}
catch (Exception ex)
{
@@ -627,6 +639,7 @@
/// </summary>
void LoadContentView()
{
+
if (!Common.ApiUtlis.Ins.DownloadDataComplete && !MainPage.NoLoginMode)
{
var waitPage = new Loading();
@@ -1210,11 +1223,11 @@
btnIcon.UnSelectedImagePath = UI2.FuntionControlView.VideoDoorLock.CommonMethod.Current.GetVideoDoorLockIcon(UI2.FuntionControlView.VideoDoorLock.CommonMethod.Comerom.collect);
//btnIcon.SelectedImagePath = $"FunctionIcon/Icon/HomeIcon/{function.IconName}_blue.png";
}
- else if (function.spk == SPK.GroupControl)
- {
- btnIcon.UnSelectedImagePath = $"FunctionIcon/Icon/HomeIcon/lightswitch_blue.png";
- btnIcon.SelectedImagePath = $"FunctionIcon/Icon/HomeIcon/lightswitch_white.png";
- }
+ //else if (function.spk == SPK.GroupControl)
+ //{
+ // btnIcon.UnSelectedImagePath = $"FunctionIcon/Icon/HomeIcon/lightswitch_blue.png";
+ // btnIcon.SelectedImagePath = $"FunctionIcon/Icon/HomeIcon/lightswitch_white.png";
+ //}
else
{
Button btnSwitch;
--
Gitblit v1.8.0