From 52748710122f275a060538564c1086e69d11ff76 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期四, 08 七月 2021 19:37:18 +0800
Subject: [PATCH] 新增功能：海林传感器，调试云端接口，暂时无法通过接口读取数据 Bug修复：乐橙可视对讲历史记录
---
HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs | 69 ++++++++++++++++++++++++++++++----
1 files changed, 61 insertions(+), 8 deletions(-)
diff --git a/HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs b/HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs
index b84b2a7..f704df6 100644
--- a/HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs
+++ b/HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs
@@ -32,6 +32,22 @@
if (bodyView != null)
{
var humiSensorList = FunctionList.List.GetEnvirSensorsList().FindAll((obj) => obj.spk == SPK.SensorHumidity);
+ var enviSensorList = FunctionList.List.GetEnvirSensorsList().FindAll((obj) => obj.spk == SPK.SensorEnvironment);
+ foreach (var enviTemp in enviSensorList)
+ {
+ var tempAttr = enviTemp.attributes.Find((obj) => obj.key == "humidity");
+ if (tempAttr != null)
+ {
+ var newTemp = new Function()
+ {
+ name = enviTemp.name,
+ sid = enviTemp.sid,
+ deviceId = enviTemp.deviceId,
+ attributes = new List<FunctionAttributes> { new FunctionAttributes { key = "value", state = tempAttr.state, curValue = tempAttr.curValue } },
+ };
+ humiSensorList.Add(newTemp);
+ }
+ }
double humiTotalValues = 0;
foreach (var temp in humiSensorList)
{
@@ -58,6 +74,22 @@
if (bodyView != null)
{
var tempSensorList = FunctionList.List.GetEnvirSensorsList().FindAll((obj) => obj.spk == SPK.SensorTemperature);
+ var enviSensorList = FunctionList.List.GetEnvirSensorsList().FindAll((obj) => obj.spk == SPK.SensorEnvironment);
+ foreach (var enviTemp in enviSensorList)
+ {
+ var tempAttr = enviTemp.attributes.Find((obj) => obj.key == "temperature");
+ if (tempAttr != null)
+ {
+ var newTemp = new Function()
+ {
+ name = enviTemp.name,
+ sid = enviTemp.sid,
+ deviceId = enviTemp.deviceId,
+ attributes = new List<FunctionAttributes> { new FunctionAttributes { key = "value", state = tempAttr.state, curValue = tempAttr.curValue } },
+ };
+ tempSensorList.Add(newTemp);
+ }
+ }
double tempTotalValues = 0;
foreach (var temp in tempSensorList)
{
@@ -359,6 +391,13 @@
btnSwitch.IsSelected = !btnSwitch.IsSelected;
new System.Threading.Thread(() =>
{
+ if(SPK.NotStatusSpkList.Contains(function.spk))
+ {
+ System.Threading.Thread.Sleep(1000);
+ Application.RunOnMainThread(() => {
+ btnSwitch.IsSelected = !btnSwitch.IsSelected;
+ });
+ }
function.trait_on_off.curValue = btnSwitch.IsSelected ? "on" : "off";
Dictionary<string, string> d = new Dictionary<string, string>();
if (function.spk == SPK.LightDimming || function.spk == SPK.LightRGB)
@@ -388,21 +427,35 @@
/// <summary>
/// 鍔犺浇鐢佃鎺у埗浜嬩欢
/// </summary>
- /// <param name="tV"></param>
- /// <param name="button"></param>
- void LoadEvent_ControlTV(Function tV, Button button)
+ /// <param name="function"></param>
+ /// <param name="btnSwitch"></param>
+ void LoadEvent_ControlTV(Function function, Button btnSwitch)
{
- button.MouseUpEventHandler = (sender, e) =>
+ btnSwitch.MouseUpEventHandler = (sender, e) =>
{
if (DB_ResidenceData.Instance.GatewayType == 1)
{
- Dictionary<string, string> d = new Dictionary<string, string>();
- d.Add("on_off", "");
- Control.Ins.SendWriteCommand(tV, d);
+ btnSwitch.IsSelected = !btnSwitch.IsSelected;
+ new System.Threading.Thread(() =>
+ {
+ if (SPK.NotStatusSpkList.Contains(function.spk))
+ {
+ System.Threading.Thread.Sleep(2000);
+ Application.RunOnMainThread(() =>
+ {
+ btnSwitch.IsSelected = !btnSwitch.IsSelected;
+ });
+ }
+
+ Dictionary<string, string> d = new Dictionary<string, string>();
+ d.Add("on_off", "");
+ Control.Ins.SendWriteCommand(function, d);
+ })
+ { IsBackground = true }.Start();
}
else
{
- new TV().ControlTV(InfraredCode_TV.Power, tV);
+ new TV().ControlTV(InfraredCode_TV.Power, function);
}
};
}
--
Gitblit v1.8.0