Revert "Merge branch 'tzy' into NewFilePath"

wxr

2020-12-17 1a13c963a5fb8cad92bf03667e411f46d6a6a843

 HDL-ON_iOS/HDL-ON_iOS.csproj

@@ -89,9 +89,9 @@
        </Reference>
    </ItemGroup>
    <ItemGroup>
      <PackageReference Include="Xamarin.Essentials" Version="1.1.0" />
      <PackageReference Include="Xamarin.Essentials" Version="1.5.3.2" />
      <PackageReference Include="Newtonsoft.Json">
        <Version>12.0.2</Version>
        <Version>12.0.3</Version>
      </PackageReference>
      <PackageReference Include="MQTTnet">
        <Version>3.0.13</Version>
@@ -591,6 +591,46 @@
      <BundleResource Include="Resources\Phone\Classification\Room\Roombg8.png" />
      <BundleResource Include="Resources\Phone\Classification\Room\Roombg9.png" />
      <BundleResource Include="Resources\Phone\Classification\Room\Roombg10.png" />
      <BundleResource Include="Resources\Phone\LogicIcon\heatlogic.png" />
      <BundleResource Include="Resources\Phone\LogicIcon\on.png" />
      <BundleResource Include="Resources\Phone\LogicIcon\off.png" />
      <BundleResource Include="Resources\Phone\LogicIcon\timecondition.png" />
      <BundleResource Include="Resources\Phone\LogicIcon\down.png" />
      <BundleResource Include="Resources\Phone\LogicIcon\timeicon.png" />
      <BundleResource Include="Resources\Phone\LogicIcon\lightloguc.png" />
      <BundleResource Include="Resources\Phone\LogicIcon\set.png" />
      <BundleResource Include="Resources\Phone\LogicIcon\addconditiontarget.png" />
      <BundleResource Include="Resources\Phone\LogicIcon\functionicon.png" />
      <BundleResource Include="Resources\Phone\LogicIcon\airconditionerlogic.png" />
      <BundleResource Include="Resources\Phone\LogicIcon\bjicon5.png" />
      <BundleResource Include="Resources\Phone\LogicIcon\delayed.png" />
      <BundleResource Include="Resources\Phone\LogicIcon\next.png" />
      <BundleResource Include="Resources\Phone\LogicIcon\curtainlogic.png" />
      <BundleResource Include="Resources\Phone\LogicIcon\weekoff.png" />
      <BundleResource Include="Resources\Phone\LogicIcon\weekon.png" />
      <BundleResource Include="Resources\Phone\LogicIcon\outletlogic.png" />
      <BundleResource Include="Resources\Phone\LogicIcon\back.png" />
      <BundleResource Include="Resources\Phone\LogicIcon\scene.png" />
      <BundleResource Include="Resources\Phone\LogicIcon\editname.png" />
      <BundleResource Include="Resources\Phone\LogicIcon\bjicon1.png" />
      <BundleResource Include="Resources\Phone\LogicIcon\bjicon2.png" />
      <BundleResource Include="Resources\Phone\LogicIcon\bjicon3.png" />
      <BundleResource Include="Resources\Phone\LogicIcon\bjicon4.png" />
      <BundleResource Include="Resources\Phone\LogicIcon\-.png" />
      <BundleResource Include="Resources\Phone\LogicIcon\+.png" />
      <BundleResource Include="Resources\Phone\LogicIcon\point.png" />
      <BundleResource Include="Resources\Phone\LogicIcon\ selected+.png" />
      <BundleResource Include="Resources\Phone\LogicIcon\selected-.png" />
      <BundleResource Include="Resources\Phone\oRobot.png" />
      <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" />
      <BundleResource Include="Resources\Phone\PersonalCenter\AppUnlockSetting\FaceIdIconBig.png" />
      <BundleResource Include="Resources\Phone\PersonalCenter\AppUnlockSetting\FingerIconBlue.png" />
    </ItemGroup>
    <ItemGroup>
      <ITunesArtwork Include="iTunesArtwork" />