From 16deafb8aca7709877907ba938ea31407f6d2834 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期三, 09 十二月 2020 15:39:34 +0800
Subject: [PATCH] 20201209
---
HDL_ON/Entity/Function/Scene.cs | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/HDL_ON/Entity/Function/Scene.cs b/HDL_ON/Entity/Function/Scene.cs
index 362a245..3f388c9 100644
--- a/HDL_ON/Entity/Function/Scene.cs
+++ b/HDL_ON/Entity/Function/Scene.cs
@@ -24,6 +24,11 @@
public class Scene
{
+ public Scene()
+ {
+ sid = NewSid();
+ gatewayId = DB_ResidenceData.residenceData.HomeGateway.gatewayId;
+ }
/// <summary>
/// 浜戠鍞竴ID
/// </summary>
@@ -202,7 +207,7 @@
string roomNameList = "";
foreach (var roomId in roomIds)
{
- var findRoom = DB_ResidenceData.residenceData.Rooms.Find(obj => obj.uid == roomId);
+ var findRoom = DB_ResidenceData.residenceData.Rooms.Find(obj => obj.roomId == roomId);
if (findRoom == null)
{
continue;
@@ -241,9 +246,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));
+ FileUtils.WriteFileByBytes(savePath, ssd);
+ MainPage.Log($"Save Scene Data : {savePath}");
+ }
}
/// <summary>
--
Gitblit v1.8.0