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/HomePageBLL.cs | 130 +++++++++++++++++++++++++++++++++++++++---
1 files changed, 119 insertions(+), 11 deletions(-)
diff --git a/HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs b/HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs
index 0bbd7a4..3bf20a9 100644
--- a/HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs
+++ b/HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs
@@ -10,6 +10,52 @@
public partial class HomePage
{
/// <summary>
+ /// 鏇存柊璁惧鍦ㄧ嚎鐘舵��
+ /// </summary>
+ public static void LoadEvent_RefreshDevcieOnline(Function function)
+ {
+ Application.RunOnMainThread(() =>
+ {
+ if (bodyView != null)
+ {
+ foreach (var view in bodyView.functionViews)
+ {
+ if (view.Tag.ToString() == function.sid)
+ {
+ for (int i = 0; i < view.ChildrenCount; i++)
+ {
+ if (view.GetChildren(i).GetType() == typeof(Button))
+ {
+ var btn = view.GetChildren(i) as Button;
+ if(btn.Tag == null)
+ {
+ continue;
+ }
+ if (btn.Tag.ToString() == function.sid)
+ {
+ if (function.online)
+ {
+ btn.UnSelectedImagePath = "Collection/Functionbg.png";
+ btn.IsSelected = false;
+ }
+ else
+ {
+ btn.UnSelectedImagePath = "Collection/FunctionOfflineBg.png";
+ btn.IsSelected = false;
+ }
+ }
+ else if (btn.Tag.ToString() == "OnlineTag")
+ {
+ btn.Visible = !function.online;
+ }
+ }
+ }
+ }
+ }
+ }
+ });
+ }
+ /// <summary>
/// 鏇存柊涓婚〉澶╂皵
/// </summary>
public static void LoadEvent_RefreshAir()
@@ -349,16 +395,63 @@
var state = false;
if (function.spk == SPK.CurtainRoller || function.spk == SPK.CurtainShades || function.spk == SPK.CurtainTrietex ||
- function.spk == SPK.CurtainSwitch)//绐楀笜璁惧鏍规嵁鐧惧垎姣斿垽鏂紑鍏崇姸鎬�
+ function.spk == SPK.CurtainSwitch || function.spk == SPK.CurtainDream)//绐楀笜璁惧鏍规嵁鐧惧垎姣斿垽鏂紑鍏崇姸鎬�
{
if (function.GetAttribute(FunctionAttributeKey.Percent) != null)
{
state = function.GetAttrState(FunctionAttributeKey.Percent) != "0";
- }else
+ }
+ else
{
if (function.GetAttrState(FunctionAttributeKey.OnOff) == "stop")
return;
state = function.trait_on_off.curValue.ToString() == "on";
+ }
+ }
+ else if (function.spk == SPK.SenesorMegahealth || function.spk == SPK.SensorMmvPose)
+ {
+
+ var tempStatus = function.attributes.Find((sta) => sta.key == FunctionAttributeKey.TargetStatus);
+ if (tempStatus != null)
+ {
+ switch (tempStatus.state)
+ {//0绌猴紝1璧帮紝2璺戯紝3鍧愶紝4璺屽�掞紝5绔�
+ case "0":
+ state = false;
+ break;
+ case "1":
+ state = true;
+ break;
+ case "2":
+ if (function.extSet.labModel)
+ {
+ state = true;
+ }
+ break;
+ case "3":
+ if (function.extSet.labModel)
+ {
+ state = true;
+ }
+ break;
+ case "4":
+ state = true;
+ break;
+ case "5":
+ if (function.extSet.labModel)
+ {
+ state = true;
+ }
+ break;
+ }
+ }
+ }
+ else if(function.spk == SPK.SensorHelp)
+ {
+ var tempStatus = function.attributes.Find((sta) => sta.key == FunctionAttributeKey.AlarmStatus);
+ if(tempStatus != null)
+ {
+ state = tempStatus.curValue.ToString() == "alarm";
}
}
else
@@ -381,7 +474,14 @@
{
if (function.spk != SPK.LightSwitch)
{
- btn.Text = function.lastState;
+ if (function.spk == SPK.SensorHelp)
+ {
+ btn.TextID = StringId.InAlarming;
+ }
+ else
+ {
+ btn.Text = function.lastState;
+ }
}
}
}
@@ -504,14 +604,14 @@
d.Add(FunctionAttributeKey.FadeTime, function.GetAttrState(FunctionAttributeKey.FadeTime));
Control.Ins.SendWriteCommand(function, d);
}
- else if (function.spk == SPK.PanelSocket)
- {
- if (function.attributes.Find((obj) => obj.key == "on_off_usb") != null)
- {
- d.Add("on_off_usb", function.trait_on_off.curValue.ToString());
- }
- Control.Ins.SendWriteCommand(function, d);
- }
+ //else if (function.spk == SPK.PanelSocket)//鍘绘帀锛岀粺涓�澶勭悊鎬绘帶
+ //{
+ // if (function.attributes.Find((obj) => obj.key == "on_off_usb") != null)
+ // {
+ // d.Add("on_off_usb", function.trait_on_off.curValue.ToString());
+ // }
+ // Control.Ins.SendWriteCommand(function, d);
+ //}
else
{
d.Add("on_off", function.trait_on_off.curValue.ToString());
@@ -718,6 +818,10 @@
/// </summary>
void GetUnreadPushMessages()
{
+ if (MainPage.NoLoginMode)
+ {
+ return;
+ }
System.Threading.Tasks.Task.Run(() =>
{
try
@@ -822,6 +926,10 @@
/// </summary>
void RegisterGetPushMessageAction()
{
+ if (MainPage.NoLoginMode)
+ {
+ return;
+ }
Action RegisterGetPushMessageAction = () => {
if (bodyView != null)
{
--
Gitblit v1.8.0