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 | 43 +++++++++++++++++++++++++++++++++----------
1 files changed, 33 insertions(+), 10 deletions(-)
diff --git a/HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs b/HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs
index dbba017..3bf20a9 100644
--- a/HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs
+++ b/HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs
@@ -408,7 +408,7 @@
state = function.trait_on_off.curValue.ToString() == "on";
}
}
- else if (function.spk == SPK.SenesorMegahealth)
+ else if (function.spk == SPK.SenesorMegahealth || function.spk == SPK.SensorMmvPose)
{
var tempStatus = function.attributes.Find((sta) => sta.key == FunctionAttributeKey.TargetStatus);
@@ -446,6 +446,14 @@
}
}
}
+ 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
{
state = function.trait_on_off.curValue.ToString() == "on";
@@ -466,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;
+ }
}
}
}
@@ -589,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());
@@ -803,6 +818,10 @@
/// </summary>
void GetUnreadPushMessages()
{
+ if (MainPage.NoLoginMode)
+ {
+ return;
+ }
System.Threading.Tasks.Task.Run(() =>
{
try
@@ -907,6 +926,10 @@
/// </summary>
void RegisterGetPushMessageAction()
{
+ if (MainPage.NoLoginMode)
+ {
+ return;
+ }
Action RegisterGetPushMessageAction = () => {
if (bodyView != null)
{
--
Gitblit v1.8.0