Merge branch 'WJC' into NewFilePath

wxr

2020-12-21 f25c6122eb7e26be5e7f036cf29b9019c4953be2

 HDL-ON_iOS/HDL-ON_iOS.csproj

@@ -62,7 +62,7 @@
        <CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
        <MtouchArch>ARM64</MtouchArch>
        <CodesignKey>iPhone Distribution: HDL Automation Co., Ltd (BVTA78PRYA)</CodesignKey>
        <CodesignProvision>dis-onpro-080401</CodesignProvision>
        <CodesignProvision>Automatic:AdHoc</CodesignProvision>
        <MtouchLink>SdkOnly</MtouchLink>
    </PropertyGroup>
    <ItemGroup>
@@ -107,6 +107,9 @@
      </PackageReference>
      <PackageReference Include="RestSharp">
        <Version>106.11.7</Version>
      </PackageReference>
      <PackageReference Include="Xamarin.iOS.Bugly">
        <Version>1.0.4</Version>
      </PackageReference>
    </ItemGroup>
    <ItemGroup>
@@ -594,16 +597,13 @@
      <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" />
@@ -631,6 +631,19 @@
      <BundleResource Include="Resources\Phone\LogicIcon\selectTheTime.png" />
      <BundleResource Include="Resources\Phone\PersonalCenter\AppUnlockSetting\FaceIdIconBig.png" />
      <BundleResource Include="Resources\Phone\PersonalCenter\AppUnlockSetting\FingerIconBlue.png" />
      <BundleResource Include="Resources\Phone\Public\ClearIcon.png" />
      <BundleResource Include="Resources\Phone\LogicIcon\time.png" />
      <BundleResource Include="Resources\Phone\ErrorIcon.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\Light\ColorTemperatrueQuick.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\Light\ColorTemperatrueQuickBack.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\Light\ColorTemperatureBar.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\Light\CozyIcon.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\Light\MeetingGuestsIcon.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\Light\ReadIcon.png" />
      <BundleResource Include="Resources\Phone\Public\PopupDialog.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\Light\CozyIconOn.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\Light\MeetingGuestsIconOn.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\Light\ReadIconOn.png" />
    </ItemGroup>
    <ItemGroup>
      <ITunesArtwork Include="iTunesArtwork" />