From f9f9b0030fdd2691632569b7dcad9d0ddca5e4cf Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期三, 23 十二月 2020 09:28:54 +0800
Subject: [PATCH] 2020-12-23 1.调整mqtt挤下线，跑ui线程。2.LoadEvent_CheckLinkStatus方法调整
---
HDL_ON/Entity/FunctionList.cs | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/HDL_ON/Entity/FunctionList.cs b/HDL_ON/Entity/FunctionList.cs
index 2b481cb..b5c9513 100644
--- a/HDL_ON/Entity/FunctionList.cs
+++ b/HDL_ON/Entity/FunctionList.cs
@@ -207,7 +207,7 @@
}
try
{
- deviceFunctionList.OrderByDescending(o => o.usageCount).ToList();
+ deviceFunctionList = deviceFunctionList.OrderByDescending(o => o.controlCounter).ToList();
}
catch (Exception ex)
{
@@ -399,10 +399,10 @@
}
else
{
+ MainPage.Log($"deviceType:{localFunction.spk} local:{localFunction.modifyTime} server:{newFunction.modifyTime}");
i++;
if (localFunction.modifyTime != newFunction.modifyTime)
{
- MainPage.Log($"local:{localFunction.modifyTime}\r\n server:{newFunction.modifyTime}");
localFunction.name = newFunction.name;
localFunction.collect = newFunction.collect;
localFunction.modifyTime = newFunction.modifyTime;
@@ -695,6 +695,9 @@
case FunctionAttributeKey.Percent:
text = Language.StringByID(StringId.PercentAdjustment);
break;
+ case FunctionAttributeKey.FadeTime:
+ text = Language.StringByID(StringId.FadeSpeed);
+ break;
}
return text;
}
--
Gitblit v1.8.0