From 1a0a7f736c6d2e7129e7591d40bed67ec7c0f09a Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期五, 05 二月 2021 10:47:42 +0800
Subject: [PATCH] 2021-02-05 1.编译冲突修改
---
HDL_ON/Entity/DB_ResidenceData.cs | 4 +---
1 files changed, 1 insertions(+), 3 deletions(-)
diff --git a/HDL_ON/Entity/DB_ResidenceData.cs b/HDL_ON/Entity/DB_ResidenceData.cs
index 81306ec..8553884 100644
--- a/HDL_ON/Entity/DB_ResidenceData.cs
+++ b/HDL_ON/Entity/DB_ResidenceData.cs
@@ -107,7 +107,7 @@
}
instance.residenceImage = "Classification/Room/Roombg.png";
//鍒濆鍖栦綇瀹呭姛鑳芥暟鎹�
- SpatialInfo.CurrentSpatial.InitRoomFunction();
+ SpatialInfo.CurrentSpatial.InitRoomListFunctions();
}
return instance;
@@ -274,7 +274,6 @@
/// <returns></returns>
static byte[] ReadResidenceInfo()
{
- MainPage.Log("get file Instance ");
var fileName = "DB_ResidenceData";
FileStream fs = null;
try
@@ -302,7 +301,6 @@
}
finally
{
- MainPage.Log("get file ");
try
{
if (fs != null)
--
Gitblit v1.8.0