From c1d681f496f2e1c53f88472d803e3c95fab521af Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期四, 29 七月 2021 09:46:16 +0800
Subject: [PATCH] 萤石测试通过
---
HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs | 220 +++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 189 insertions(+), 31 deletions(-)
diff --git a/HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs b/HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs
index 2122e54..51aeb25 100644
--- a/HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs
+++ b/HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs
@@ -23,10 +23,122 @@
}
/// <summary>
+ /// 鏇存柊瀹ゅ唴浼犳劅鍣ㄦ暟鎹�-婀垮害
+ /// </summary>
+ public static void LoadEvent_RefreshEnvirIndoorHumi()
+ {
+ Application.RunOnMainThread(() =>
+ {
+ 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;
+ int humiTotalCount = 0;
+ foreach (var temp in humiSensorList)
+ {
+ double humiValue = 0;
+ double.TryParse(temp.GetAttrState(FunctionAttributeKey.Value), out humiValue);
+ if(humiValue > 0)
+ {
+ humiTotalValues += humiValue;
+ humiTotalCount++;
+ }
+ }
+ if (humiTotalValues > 0)
+ {
+ bodyView.btnIndoorHumiValues.Text = "/" + (humiTotalValues /humiTotalCount).ToString("0")+ "%";
+ }
+ bodyView.btnIndoorHumiValues.Width = bodyView.btnIndoorHumiValues.GetTextWidth();
+ }
+ });
+ }
+
+ /// <summary>
+ /// 鏇存柊瀹ゅ唴浼犳劅鍣ㄦ暟鎹�
+ /// </summary>
+ public static void LoadEvent_RefreshEnvirIndoorTemp()
+ {
+ Application.RunOnMainThread(() =>
+ {
+ 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;
+ int tempTotalCount = 0;
+ foreach (var temp in tempSensorList)
+ {
+ double tempValue = 0;
+ double.TryParse(temp.GetAttrState(FunctionAttributeKey.Value), out tempValue);
+ if (tempValue > 0)
+ {
+ tempTotalValues += tempValue;
+ tempTotalCount++;
+ }
+ }
+ if (tempTotalValues > 0)
+ {
+ bodyView.btnIndoorTempValues.Text = "/" + (tempTotalValues /tempTotalCount).ToString("0.0")+ "掳";
+ }
+ bodyView.btnIndoorTempValues.Width = bodyView.btnIndoorTempValues.GetTextWidth();
+ }
+ });
+ }
+
+ /// <summary>
+ /// 鏇存柊鍔熻兘鍒楄〃涓婚〉
+ /// </summary>
+ public static void RefreshFunctionView()
+ {
+ if (bodyView != null && MainPage.CurPageIndex==0)
+ {
+ bodyView.LoadDeviceFunctionControlZone();
+ }
+ }
+
+ /// <summary>
/// 鏇存柊杩炴帴鐘舵�佸浘鏍�
/// </summary>
void CheckLinkStatus()
{
+ //Dome妯″紡
+ if (MainPage.NoLoginMode)
+ {
+ bodyView.btnLinkStateTip.BackgroundColor = CSS.CSS_Color.MainColor;
+ return;
+ }
+
if (!Control.Ins.GatewayOnline_Local && !Control.Ins.GatewayOnline_Cloud)
{
bodyView.btnLinkStateTip.BackgroundColor = CSS.CSS_Color.LinkTipFail;
@@ -163,7 +275,7 @@
/// </summary>
public static void UpdataFunctionStates(Function function)
{
- Application.RunOnMainThread((Action)(() =>
+ Application.RunOnMainThread(() =>
{
try
{
@@ -173,7 +285,16 @@
{
if (view.Tag.ToString() == function.sid)
{
- var state = function.trait_on_off.curValue.ToString() == "on";
+ var state = false;
+ if (function.spk == SPK.CurtainRoller || function.spk == SPK.CurtainShades || function.spk == SPK.CurtainTrietex ||
+ function.spk == SPK.CurtainSwitch)//绐楀笜璁惧鏍规嵁鐧惧垎姣斿垽鏂紑鍏崇姸鎬�
+ {
+ state = function.GetAttrState(FunctionAttributeKey.Percent) != "0";
+ }
+ else
+ {
+ state = function.trait_on_off.curValue.ToString() == "on";
+ }
for (int i = 0; i < view.ChildrenCount; i++)
{
if (view.GetChildren(i).GetType() == typeof(Button))
@@ -204,7 +325,7 @@
{
MainPage.Log($"HomePage updata funciton states error {ex.Message}");
}
- }));
+ });
}
/// <summary>
@@ -280,22 +401,28 @@
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)
{
- var light = function as Light;
- d.Add(FunctionAttributeKey.OnOff, light.trait_on_off.curValue.ToString());
+ d.Add(FunctionAttributeKey.OnOff, function.trait_on_off.curValue.ToString());
if (btnSwitch.IsSelected)
{
- d.Add(FunctionAttributeKey.Brightness, light.lastBrightness.ToString());
+ d.Add(FunctionAttributeKey.Brightness, function.lastBrightness.ToString());
}
else
{
- light.lastBrightness = light.brightness;
+ function.lastBrightness = Convert.ToInt32(function.GetAttrState(FunctionAttributeKey.Brightness));
}
- d.Add(FunctionAttributeKey.FadeTime, light.fadeTime.ToString());
- Control.Ins.SendWriteCommand(light, d);
+ d.Add(FunctionAttributeKey.FadeTime, function.GetAttrState(FunctionAttributeKey.FadeTime));
+ Control.Ins.SendWriteCommand(function, d);
}
else
{
@@ -310,46 +437,61 @@
/// <summary>
/// 鍔犺浇鐢佃鎺у埗浜嬩欢
/// </summary>
- /// <param name="tV"></param>
- /// <param name="button"></param>
- void LoadEvent_ControlTV(TV 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) =>
{
- tV.ControlTV(InfraredCode_TV.Power);
+ if (DB_ResidenceData.Instance.GatewayType == 1)
+ {
+ 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, function);
+ }
};
}
/// <summary>
/// 鍔犺浇绐楀笜鎺у埗浜嬩欢
/// </summary>
- void LoadEvent_ControlCurtain(Curtain curtain, Button btnClose, Button btnOpen)
+ void LoadEvent_ControlCurtain(Function curtain, Button btnClose, Button btnOpen)
{
- btnClose.MouseDownEventHandler = (sender, e) =>
- {
- btnClose.IsSelected = true;
- };
btnClose.MouseUpEventHandler = (sender, e) =>
{
- btnClose.IsSelected = false;
+ btnClose.IsSelected = true;
curtain.trait_on_off.curValue = "off";
- curtain.percent = 0;
+ curtain.SetAttrState(FunctionAttributeKey.Percent, 0);
Dictionary<string, string> d = new Dictionary<string, string>();
- d.Add("on_off", curtain.trait_on_off.curValue.ToString());
+ d.Add(FunctionAttributeKey.OnOff, curtain.trait_on_off.curValue.ToString());
Control.Ins.SendWriteCommand(curtain, d);
};
- btnOpen.MouseDownEventHandler = (sender, e) =>
- {
- btnOpen.IsSelected = true;
- };
btnOpen.MouseUpEventHandler = (sender, e) =>
{
- btnOpen.IsSelected = false;
+ btnOpen.IsSelected = true;
curtain.trait_on_off.curValue = "on";
- curtain.percent = 100;
+ curtain.SetAttrState(FunctionAttributeKey.Percent, 100);
Dictionary<string, string> d = new Dictionary<string, string>();
- d.Add("on_off", curtain.trait_on_off.curValue.ToString());
+ d.Add(FunctionAttributeKey.OnOff, curtain.trait_on_off.curValue.ToString());
Control.Ins.SendWriteCommand(curtain, d);
};
}
@@ -365,7 +507,15 @@
};
btnUp.MouseUpEventHandler = (sender, e) =>
{
- btnUp.IsSelected = false;
+ new System.Threading.Thread(() =>
+ {
+ System.Threading.Thread.Sleep(2000);
+ Application.RunOnMainThread(() =>
+ {
+ btnUp.IsSelected = false;
+ });
+ })
+ { IsBackground = true }.Start();
function.SetAttrState(FunctionAttributeKey.Position, "up");
Dictionary<string, string> d = new Dictionary<string, string>();
d.Add(FunctionAttributeKey.Position, "up");
@@ -378,7 +528,15 @@
};
btnDown.MouseUpEventHandler = (sender, e) =>
{
- btnDown.IsSelected = false;
+ new System.Threading.Thread(() =>
+ {
+ System.Threading.Thread.Sleep(2000);
+ Application.RunOnMainThread(() =>
+ {
+ btnDown.IsSelected = false;
+ });
+ })
+ { IsBackground = true }.Start();
function.SetAttrState(FunctionAttributeKey.Position, "down");
Dictionary<string, string> d = new Dictionary<string, string>();
d.Add(FunctionAttributeKey.Position, "down");
--
Gitblit v1.8.0