From d28071b18ede6fe5c4502a73d358a36acaa5f678 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 16 十二月 2020 10:57:33 +0800
Subject: [PATCH] Merge branch 'WJC' into NewFilePath
---
HDL-ON_iOS/HDL-ON_iOS.csproj | 4 ++++
HDL_ON/Entity/DB_ResidenceData.cs | 2 ++
2 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/HDL-ON_iOS/HDL-ON_iOS.csproj b/HDL-ON_iOS/HDL-ON_iOS.csproj
index 91e5634..396634c 100644
--- a/HDL-ON_iOS/HDL-ON_iOS.csproj
+++ b/HDL-ON_iOS/HDL-ON_iOS.csproj
@@ -625,6 +625,10 @@
<BundleResource Include="Resources\Phone\FunctionIcon\Light\ColorWheelGray.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\Light\ColorWheelTip.png" />
<BundleResource Include="Resources\Phone\RoomListBg.png" />
+ <BundleResource Include="Resources\Phone\LogicIcon\link.png" />
+ <BundleResource Include="Resources\Phone\LogicIcon\selectTheFun.png" />
+ <BundleResource Include="Resources\Phone\LogicIcon\selectTheScene.png" />
+ <BundleResource Include="Resources\Phone\LogicIcon\selectTheTime.png" />
</ItemGroup>
<ItemGroup>
<ITunesArtwork Include="iTunesArtwork" />
diff --git a/HDL_ON/Entity/DB_ResidenceData.cs b/HDL_ON/Entity/DB_ResidenceData.cs
index 04ffcb9..16fb651 100644
--- a/HDL_ON/Entity/DB_ResidenceData.cs
+++ b/HDL_ON/Entity/DB_ResidenceData.cs
@@ -123,6 +123,8 @@
HomeGateway = null;
SpatialInfo.CurrentSpatial.Clear();
FunctionList.List.Clear();
+ ///鍒囨崲浣忓畢娓呯┖鍓嶄綇瀹呯紦瀛樿嚜鍔ㄥ寲鍒楄〃锛�
+ HDL_ON.UI.UI2.Intelligence.Automation.Logic.LogicList.Clear();
if (MainPage.IsRemote)
{
DAL.Mqtt.MqttClient.DisConnectRemote("閫�鍑虹櫥褰曪紝鎴栬�呭垏鎹綇瀹�");
--
Gitblit v1.8.0