Merge branch 'WJC' into NewFilePath

wxr

2020-12-16 d28071b18ede6fe5c4502a73d358a36acaa5f678

Merge branch 'WJC' into NewFilePath

 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" />

 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("退出登录，或者切换住宅");