From 9c8baf7e7e1169ebdf7d5f7ed33ab29dd5fcbf18 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期一, 14 十二月 2020 17:45:17 +0800
Subject: [PATCH] 2020-12-14 1.解锁设置问题修复，增加面容ID验证。2.错误码对接增加。
---
HDL_ON/Entity/Function/Scene.cs | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/HDL_ON/Entity/Function/Scene.cs b/HDL_ON/Entity/Function/Scene.cs
index 3f388c9..67d0c57 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,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);
}
}
}
@@ -330,7 +333,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