From a35617eb62b317bf3ed92b1462018cf67c920411 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期二, 15 十二月 2020 15:17:35 +0800
Subject: [PATCH] 2020-12-15-2
---
HDL_ON/Entity/Function/Scene.cs | 19 ++++++++++++++++---
1 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/HDL_ON/Entity/Function/Scene.cs b/HDL_ON/Entity/Function/Scene.cs
index 49f8199..3983d39 100644
--- a/HDL_ON/Entity/Function/Scene.cs
+++ b/HDL_ON/Entity/Function/Scene.cs
@@ -27,9 +27,9 @@
public Scene()
{
sid = NewSid();
- if (DB_ResidenceData.residenceData.HomeGateway !=null && !string.IsNullOrEmpty(DB_ResidenceData.residenceData.HomeGateway.gatewayId))
+ if (!DB_ResidenceData.Instance.CheckWhetherGatewayIdIsNull())
{
- gatewayId = DB_ResidenceData.residenceData.HomeGateway.gatewayId;
+ gatewayId = DB_ResidenceData.Instance.HomeGateway.gatewayId;
}
}
/// <summary>
@@ -256,6 +256,19 @@
MainPage.Log($"Save Scene Data : {savePath}");
}
}
+ /// <summary>
+ /// 娣诲姞鍦烘櫙
+ /// </summary>
+ public void AddScene()
+ {
+ var pm = new HttpServerRequest();
+ var revPack = pm.AddScene(this);
+ if (revPack.Code == StateCode.SUCCESS)
+ {
+ var ssd = System.Text.Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(this));
+ Common.FileUtlis.Files.WriteFileByBytes(savePath, ssd);
+ }
+ }
/// <summary>
/// 涓婁紶鏁版嵁鍒颁簯绔�
@@ -333,7 +346,7 @@
/// <returns></returns>
Function ConvertFunctionObject()
{
- var localFunction = DB_ResidenceData.functionList.GetAllDeviceFunctionList().Find((obj) => obj.sid == sid);
+ var localFunction = FunctionList.List.GetDeviceFunctionList().Find((obj) => obj.sid == sid);
foreach (var s in status)
{
localFunction.attributes.Add(new FunctionAttributes() { key = s.key, curValue = s.value, value = new List<string>() { s.value } });
--
Gitblit v1.8.0