From 35c4bc03ee8da50317cd3f33e9f52f0a4259affd Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期三, 23 十二月 2020 15:53:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/WJC' into NewFilePath
---
HDL_ON/Entity/FunctionList.cs | 78 +++++++++++++++++++++++++++++++++------
1 files changed, 66 insertions(+), 12 deletions(-)
diff --git a/HDL_ON/Entity/FunctionList.cs b/HDL_ON/Entity/FunctionList.cs
old mode 100755
new mode 100644
index 0be3c7f..7adfaaf
--- a/HDL_ON/Entity/FunctionList.cs
+++ b/HDL_ON/Entity/FunctionList.cs
@@ -2,6 +2,7 @@
using System.Collections.Generic;
using System.Linq;
using System.Threading;
+using HDL_ON.Common;
using HDL_ON.DAL;
using HDL_ON.DAL.Server;
using Shared;
@@ -91,10 +92,18 @@
/// </summary>
public List<Sensor> sensorsEnvironmentalScience = new List<Sensor>();
+ public List<Scene> scenes = new List<Scene>();
/// <summary>
/// 鍦烘櫙鍒楄〃
/// </summary>
- public List<Scene> scenes = new List<Scene>();
+ //public List<Scene> Scenes
+ //{
+ // get
+ // {
+ // List.scenes = List.scenes.OrderByDescending(o => o.createTime).ToList();
+ // return List.scenes;
+ // }
+ //}
/// <summary>
/// 鍔熻兘鍒楄〃
/// </summary>
@@ -207,7 +216,7 @@
}
try
{
- deviceFunctionList.OrderByDescending(o => o.usageCount).ToList();
+ deviceFunctionList = deviceFunctionList.OrderByDescending(o => o.controlCounter).ToList();
}
catch (Exception ex)
{
@@ -363,7 +372,7 @@
}
else
{
- Utlis.ShowTip(Shared.Language.StringByID(StringId.EditFunctionInfoFail) + "\r\nCode:" + pack.Code);
+ IMessageCommon.Current.ShowErrorInfoAlter(pack.Code);
}
return pack.Code;
}
@@ -399,10 +408,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 +599,21 @@
{
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();
+ count = 0;
+ }
}
- DriverLayer.Control.Ins.SendApiReadCommand(functionIds);
+ DriverLayer.Control.Ins.SendApiReadCommand(page);
}
else
{
@@ -630,7 +648,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,14 +656,47 @@
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);
+ FileUtlis.Files.WriteFileByBytes(scene.savePath, ssd);
+ result = tempScene;
}
- result = revPack.Code;
- return tempScene;
+ else
+ {
+ result = tempScene;
+ }
+ return revPack.Code;
}
#endregion
+
+ #region 鏀惰棌鍔熻兘
+
+ /// <summary>
+ /// 鏀惰棌鍦烘櫙
+ /// </summary>
+ public string CollectScene(Scene scene)
+ {
+ var result = "";
+ if (scene.collect)
+ {
+ result = ApiUtlis.Ins.HttpRequest.CollectDevice(scene.userSceneId).Code;
+ }
+ else
+ {
+ result = ApiUtlis.Ins.HttpRequest.CancelCollectDevice(scene.userSceneId).Code;
+ }
+
+ //鎻愮ず閿欒
+ if (result != StateCode.SUCCESS)
+ {
+ IMessageCommon.Current.ShowErrorInfoAlter(result);
+ }
+
+ return result;
+ }
+
+ #endregion
+
#region 鍔熻兘鏂囨湰鐩稿叧
/// <summary>
@@ -687,6 +738,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