From 680d96f157e4609af3e7af6f8d01ee0bf3f55063 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 11 十二月 2020 21:11:04 +0800
Subject: [PATCH] 20201210
---
HDL_ON/Entity/Function/Scene.cs | 23 +++++++++++++++++------
1 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/HDL_ON/Entity/Function/Scene.cs b/HDL_ON/Entity/Function/Scene.cs
index 362a245..49f8199 100644
--- a/HDL_ON/Entity/Function/Scene.cs
+++ b/HDL_ON/Entity/Function/Scene.cs
@@ -24,6 +24,14 @@
public class Scene
{
+ public Scene()
+ {
+ sid = NewSid();
+ if (DB_ResidenceData.residenceData.HomeGateway !=null && !string.IsNullOrEmpty(DB_ResidenceData.residenceData.HomeGateway.gatewayId))
+ {
+ gatewayId = DB_ResidenceData.residenceData.HomeGateway.gatewayId;
+ }
+ }
/// <summary>
/// 浜戠鍞竴ID
/// </summary>
@@ -202,7 +210,7 @@
string roomNameList = "";
foreach (var roomId in roomIds)
{
- var findRoom = DB_ResidenceData.residenceData.Rooms.Find(obj => obj.uid == roomId);
+ var findRoom = SpatialInfo.CurrentSpatial.RoomList.Find(obj => obj.roomId == roomId);
if (findRoom == null)
{
continue;
@@ -241,9 +249,12 @@
{
UploadScene();
}
- var ssd = System.Text.Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(this));
- FileUtils.WriteFileByBytes(savePath, ssd);
- MainPage.Log($"Save Scene Data : {savePath}");
+ else
+ {
+ var ssd = System.Text.Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(this));
+ Common.FileUtlis.Files.WriteFileByBytes(savePath, ssd);
+ MainPage.Log($"Save Scene Data : {savePath}");
+ }
}
/// <summary>
@@ -259,7 +270,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))
@@ -272,7 +283,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);
}
}
}
--
Gitblit v1.8.0