From 1170a384130c143d5930efe108afe82c5da64f24 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期二, 19 十月 2021 15:08:35 +0800
Subject: [PATCH] 场景编辑新风闪退修复
---
HDL_ON/Entity/Room.cs | 24 ++++++++++++++++++++++--
1 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/HDL_ON/Entity/Room.cs b/HDL_ON/Entity/Room.cs
index df6eb59..609e788 100644
--- a/HDL_ON/Entity/Room.cs
+++ b/HDL_ON/Entity/Room.cs
@@ -46,9 +46,10 @@
public SpatialInfo(string spatialType)
{
roomType = "FLOOR";
- parentId = DB_ResidenceData.Instance.CurrentRegion.RegionID;
+ parentId = DB_ResidenceData.Instance.CurrentRegion.id;
}
+ public string homeId = "";
public string roomId = "";
public string roomName = "";
//public string roomImage = "";
@@ -56,6 +57,7 @@
public string roomType = "";
public string parentId = "";
public string uid = Guid.NewGuid().ToString();
+ public string floorRoomName = "";
public string createTime = "";
public string modifyTime = "";
///// <summary>
@@ -110,6 +112,15 @@
{
get
{
+ if (MainPage.NoLoginMode)
+ {
+ if (floors == null)
+ {
+ floors = new List<SpatialInfo>();
+ }
+ return floors;
+ }
+
if (floors == null)
{
try
@@ -121,13 +132,14 @@
MainPage.Log(floorsDataString);
floors = Newtonsoft.Json.JsonConvert.DeserializeObject<List<SpatialInfo>>(floorsDataString);
}
- if (floors == null)
+ if(floors == null)
{
floors = new List<SpatialInfo>();
}
}
catch (Exception ex)
{
+ floors = new List<SpatialInfo>();
MainPage.Log($"妤煎眰鏁版嵁鍒濆鍖栧け璐ワ細{ex.Message}");
}
}
@@ -242,6 +254,14 @@
{
get
{
+ if(MainPage.NoLoginMode )
+ {
+ if (rooms == null)
+ {
+ rooms = new List<Room>();
+ }
+ return rooms;
+ }
if (rooms == null)
{
try
--
Gitblit v1.8.0