From b3abfd30576871c32f2839a322fa3bb783f96498 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期六, 12 十二月 2020 19:10:10 +0800
Subject: [PATCH] 2020-12-12 1.解锁逻辑优化
---
HDL_ON/Entity/Function/Scene.cs | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/HDL_ON/Entity/Function/Scene.cs b/HDL_ON/Entity/Function/Scene.cs
index 3f388c9..8cc2700 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.residenceData.CheckWhetherGatewayIdIsNull())
+ {
+ gatewayId = DB_ResidenceData.residenceData.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,7 +252,7 @@
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}");
}
}
@@ -267,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))
@@ -280,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