From d07d62be7111d78b2aaa44c9cdee23a7d22b4dda Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期二, 22 十二月 2020 10:38:15 +0800
Subject: [PATCH] 20201222-1
---
HDL_ON/Entity/FunctionList.cs | 21 ++++++++++++++++-----
1 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/HDL_ON/Entity/FunctionList.cs b/HDL_ON/Entity/FunctionList.cs
index bc2eddc..f532c89 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.usageCount).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;
@@ -590,12 +590,20 @@
{
if (DriverLayer.Control.Ins.IsRemote)
{
- var functionIds = new List<string>();
+ var page = new List<string>();
+ int count = 0;
+
foreach (var function in GetDeviceFunctionList())
{
- functionIds.Add(function.deviceId);
+ page.Add(function.deviceId);
+ count++;
+ if (count > 9)
+ {
+ DriverLayer.Control.Ins.SendApiReadCommand(page);
+ page.Clear();
+ }
}
- DriverLayer.Control.Ins.SendApiReadCommand(functionIds);
+ DriverLayer.Control.Ins.SendApiReadCommand(page);
}
else
{
@@ -687,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