From 5851291c78b2cb5532e6938c77b5f51eb06a6ad2 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期一, 21 十二月 2020 19:41:07 +0800
Subject: [PATCH] Merge branch 'NewFilePath' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project into NewFilePath
---
HDL_ON/Entity/FunctionList.cs | 27 +++++++++++++++++++--------
1 files changed, 19 insertions(+), 8 deletions(-)
diff --git a/HDL_ON/Entity/FunctionList.cs b/HDL_ON/Entity/FunctionList.cs
index 0be3c7f..5253ac7 100644
--- a/HDL_ON/Entity/FunctionList.cs
+++ b/HDL_ON/Entity/FunctionList.cs
@@ -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
{
@@ -630,7 +638,7 @@
/// <summary>
/// 娣诲姞鍦烘櫙
/// </summary>
- public Scene AddScene(Scene scene,out string result)
+ public string AddScene(Scene scene,out Scene result)
{
Scene tempScene = null;
var pm = new HttpServerRequest();
@@ -638,12 +646,12 @@
if (revPack.Code == StateCode.SUCCESS)
{
var sceneList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Scene>>(revPack.Data.ToString());
- tempScene = sceneList.Find((obj) => obj.userSceneId == scene.userSceneId);
+ tempScene = sceneList.Find((obj) => obj.sid == scene.sid);
var ssd = System.Text.Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(tempScene));
Common.FileUtlis.Files.WriteFileByBytes(scene.savePath, ssd);
}
- result = revPack.Code;
- return tempScene;
+ result = tempScene;
+ return revPack.Code;
}
#endregion
@@ -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