From 305f57840fff5b7cb1914b35c56eaece618711e7 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期四, 14 一月 2021 17:06:36 +0800
Subject: [PATCH] 2021-01-14 1. 修改判断当前值是否需要参与签名方法，保持跟云端一致
---
HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs | 85 ++++++++++++++++++++++++++++++------------
1 files changed, 60 insertions(+), 25 deletions(-)
diff --git a/HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs b/HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs
index 67ad29e..e51c591 100644
--- a/HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs
+++ b/HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs
@@ -21,32 +21,63 @@
bodyView.btnPm25Values.Text = MainPage.cityInfo.pm25 == null ? "--" : MainPage.cityInfo.pm25;
}
}
+
+ /// <summary>
+ /// 鏇存柊杩炴帴鐘舵�佸浘鏍�
+ /// </summary>
+ void CheckLinkStatus()
+ {
+ if (Control.Ins.GatewayOnline)
+ {
+ if (Control.Ins.IsRemote)
+ {
+ bodyView.btnLinkStateTip.BackgroundColor = CSS.CSS_Color.MainColor;
+ }
+ else
+ {
+ bodyView.btnLinkStateTip.BackgroundColor = CSS.CSS_Color.LinkTipRemote;
+ }
+ }
+ else
+ {
+ bodyView.btnLinkStateTip.BackgroundColor = CSS.CSS_Color.LinkTipFail;
+ }
+ }
+
/// <summary>
/// 纭杩炴帴鐘舵��
/// </summary>
public static void LoadEvent_CheckLinkStatus()
{
- if (bodyView != null)
+ Application.RunOnMainThread(() =>
{
- Application.RunOnMainThread(() =>
+ if (bodyView != null)
{
- if (Control.Ins.GatewayOnline)
- {
- if (Control.Ins.IsRemote)
- {
- bodyView.btnLinkStateTip.BackgroundColor = CSS.CSS_Color.LinkTipRemote;
- }
- else
- {
- bodyView.btnLinkStateTip.BackgroundColor = CSS.CSS_Color.MainColor;
- }
- }
- else
- {
- bodyView.btnLinkStateTip.BackgroundColor = CSS.CSS_Color.LinkTipFail;
- }
- });
- }
+ bodyView.CheckLinkStatus();
+ }
+ });
+
+ //if (bodyView != null)
+ //{
+ // Application.RunOnMainThread(() =>
+ // {
+ // if (Control.Ins.GatewayOnline)
+ // {
+ // if (Control.Ins.IsRemote)
+ // {
+ // bodyView.btnLinkStateTip.BackgroundColor = CSS.CSS_Color.MainColor;
+ // }
+ // else
+ // {
+ // bodyView.btnLinkStateTip.BackgroundColor = CSS.CSS_Color.LinkTipRemote;
+ // }
+ // }
+ // else
+ // {
+ // bodyView.btnLinkStateTip.BackgroundColor = CSS.CSS_Color.LinkTipFail;
+ // }
+ // });
+ //}
}
/// <summary>
@@ -57,7 +88,7 @@
btn.MouseUpEventHandler += (sender, e) =>
{
function.collect = false;
- if (function.functionCategory == FunctionCategory.Music)//澶勭悊闊充箰涓讳粠鍏崇郴
+ if (function.Spk_Prefix == FunctionCategory.Music)//澶勭悊闊充箰涓讳粠鍏崇郴
{
if ((function as Music.A31MusicModel).ServerClientType == 1)
{
@@ -67,7 +98,7 @@
}
string msg = function.name + Language.StringByID(StringId.CollectionCancelled);
LoadDeviceFunctionControlZone();
- function.SaveFunctionData(true);
+ function.CollectFunction();
new PublicAssmebly().TipMsgAutoClose(msg, true);
};
}
@@ -146,7 +177,7 @@
/// </summary>
public static void UpdataFunctionStates(Function function)
{
- Application.RunOnMainThread(() =>
+ Application.RunOnMainThread((Action)(() =>
{
try
{
@@ -165,13 +196,16 @@
btn.IsSelected = state;
if (btn.Tag != null && btn.Tag.ToString() == "state")
{
- if (function.functionCategory == FunctionCategory.Music)
+ if (function.Spk_Prefix == FunctionCategory.Music)
{
btn.Text = (function as Music.A31MusicModel).A31PlayStatus.Title;
}
else
{
- btn.Text = function.lastState;
+ if (function.spk != SPK.LightSwitch)
+ {
+ btn.Text = function.lastState;
+ }
}
}
}
@@ -184,7 +218,7 @@
{
MainPage.Log($"HomePage updata funciton states error {ex.Message}");
}
- });
+ }));
}
/// <summary>
@@ -274,6 +308,7 @@
{
light.lastBrightness = light.brightness;
}
+ d.Add(FunctionAttributeKey.FadeTime, light.fadeTime.ToString());
Control.Ins.SendWriteCommand(light, d);
}
else
--
Gitblit v1.8.0