From 0f6b72e77c67912810c308987f87986871e97640 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期二, 15 十二月 2020 09:53:47 +0800
Subject: [PATCH] 20201215-2
---
HDL_ON/Entity/Function/Scene.cs | 28 ++++++++++++++++++++++------
1 files changed, 22 insertions(+), 6 deletions(-)
diff --git a/HDL_ON/Entity/Function/Scene.cs b/HDL_ON/Entity/Function/Scene.cs
index 3f388c9..3983d39 100644
--- a/HDL_ON/Entity/Function/Scene.cs
+++ b/HDL_ON/Entity/Function/Scene.cs
@@ -27,7 +27,10 @@
public Scene()
{
sid = NewSid();
- gatewayId = DB_ResidenceData.residenceData.HomeGateway.gatewayId;
+ if (!DB_ResidenceData.Instance.CheckWhetherGatewayIdIsNull())
+ {
+ gatewayId = DB_ResidenceData.Instance.HomeGateway.gatewayId;
+ }
}
/// <summary>
/// 浜戠鍞竴ID
@@ -207,7 +210,7 @@
string roomNameList = "";
foreach (var roomId in roomIds)
{
- var findRoom = DB_ResidenceData.residenceData.Rooms.Find(obj => obj.roomId == roomId);
+ var findRoom = SpatialInfo.CurrentSpatial.RoomList.Find(obj => obj.roomId == roomId);
if (findRoom == null)
{
continue;
@@ -249,8 +252,21 @@
else
{
var ssd = System.Text.Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(this));
- FileUtils.WriteFileByBytes(savePath, ssd);
+ Common.FileUtlis.Files.WriteFileByBytes(savePath, ssd);
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);
}
}
@@ -267,7 +283,7 @@
if (revPack.Code == StateCode.SUCCESS)
{
var ssd = System.Text.Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(this));
- FileUtils.WriteFileByBytes(savePath, ssd);
+ Common.FileUtlis.Files.WriteFileByBytes(savePath, ssd);
}
}
else if (!string.IsNullOrEmpty(createTime) && !string.IsNullOrEmpty(modifyTime))
@@ -280,7 +296,7 @@
if (tempScene != null)
{
var ssd = System.Text.Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(tempScene));
- FileUtils.WriteFileByBytes(savePath, ssd);
+ Common.FileUtlis.Files.WriteFileByBytes(savePath, ssd);
}
}
}
@@ -330,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