From 592974441a4df95fffd9167c90192da1a390b1c2 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 06 六月 2023 11:51:12 +0800
Subject: [PATCH] Merge branch 'Dev-Branch'
---
HDL_ON/UI/UI2/1-HomePage/HomePage.cs | 44 +++++++++++++++++++++++++++++---------------
1 files changed, 29 insertions(+), 15 deletions(-)
diff --git a/HDL_ON/UI/UI2/1-HomePage/HomePage.cs b/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
index 631866a..0c52ed6 100644
--- a/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
+++ b/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
@@ -289,7 +289,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 +301,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 +359,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 +416,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 +455,8 @@
};
btnPm25Values.Width = btnPm25Values.GetTextWidth();
environmentalView.AddChidren(btnPm25Values);
-#endregion
+ #endregion
+
btnSecurityStatus = new Button()
{
@@ -598,9 +605,9 @@
TextAlignment = TextAlignment.Center,
};
changeView.AddChidren(btnChangeScene);
-#endregion
+ #endregion
-#region ContextView
+ #region ContextView
contentView = new PageLayout()
{
//Y = changeView.Bottom,
@@ -613,7 +620,7 @@
LoadContentView();
-#endregion
+ #endregion
}
catch (Exception ex)
{
@@ -627,6 +634,7 @@
/// </summary>
void LoadContentView()
{
+
if (!Common.ApiUtlis.Ins.DownloadDataComplete && !MainPage.NoLoginMode)
{
var waitPage = new Loading();
@@ -724,7 +732,8 @@
try
{
int index = 0;
- var list = FunctionList.List.GetDeviceFunctionList();
+ var list = new List<Function>();
+ list.AddRange(FunctionList.List.GetDeviceFunctionList());
list.AddRange(FunctionList.List.groupControls);//鍔犲叆缇ゆ帶
foreach (var function in list)
{
@@ -1024,6 +1033,7 @@
btnState.Text = function.lastState;
}
}
+
else
{
btnIcon.UnSelectedImagePath = $"FunctionIcon/Icon/HomeIcon/{function.IconName}_blue.png";
@@ -1056,7 +1066,7 @@
if (//SPK.CurtainSpkList().Contains(function.spk))
function.spk == SPK.CurtainRoller || function.spk == SPK.CurtainShades ||
function.spk == SPK.CurtainDream ||
- function.spk == SPK.CurtainSwitch || function.spk == SPK.CurtainTrietex )
+ function.spk == SPK.CurtainSwitch || function.spk == SPK.CurtainTrietex)
{
btnIcon.UnSelectedImagePath = "FunctionIcon/Curtain/CurtainIcon.png";
btnIcon.SelectedImagePath = "FunctionIcon/Curtain/CurtainOnIcon.png";
@@ -1141,7 +1151,7 @@
btnPower.IsSelected = true;
status = "on";
}
- function.SetAttrState("on_off", status);
+ function.SetAttrState("on_off", status);
Dictionary<string, string> dic = new Dictionary<string, string>();
dic.Add("on_off", status);
Music.SendMethod.Current.SendControlCommand(function, dic);
@@ -1155,7 +1165,7 @@
Button btnUp;
btnUp = new Button()
{
- X = Application.GetRealWidth(84+3),
+ X = Application.GetRealWidth(84 + 3),
Y = Application.GetRealWidth(89),
Width = Application.GetRealWidth(38),
Height = Application.GetRealWidth(38),
@@ -1180,7 +1190,7 @@
LoadEvent_ControlClothesHanger(function, btnUp, btnDown);
}
-
+
else if (function.spk == SPK.SenesorMegahealth || function.spk == SPK.SensorMmvPose)
{
//btnIcon.UnSelectedImagePath = $"FunctionIcon/Icon/HomeIcon/{function.IconName}.png";
@@ -1205,8 +1215,13 @@
}
else if (function.spk == SPK.VideoDoorLock)
{
- btnIcon.UnSelectedImagePath =UI2.FuntionControlView.VideoDoorLock.CommonMethod.Current.GetVideoDoorLockIcon(UI2.FuntionControlView.VideoDoorLock.CommonMethod.Comerom.collect);
+ 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
{
@@ -1221,7 +1236,6 @@
SelectedImagePath = "Public/SwitchOn.png",
};
view.AddChidren(btnSwitch);
-
btnIcon.UnSelectedImagePath = $"FunctionIcon/Icon/HomeIcon/{function.IconName}_blue.png";
btnIcon.SelectedImagePath = $"FunctionIcon/Icon/HomeIcon/{function.IconName}_white.png";
LoadEvent_SwitchFunction(function, btnSwitch);
--
Gitblit v1.8.0