Revert "Merge branch 'tzy' into NewFilePath"

wxr

2020-12-17 1a13c963a5fb8cad92bf03667e411f46d6a6a843

 HDL-ON_iOS/HDL-ON_iOS.csproj

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -110,150 +110,78 @@
    </PackageReference>
  </ItemGroup>
  <ItemGroup>
    <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Contents.json">
      <Visible>false</Visible>
    </ImageAsset>
    <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1024x500.png">
      <Visible>false</Visible>
    </ImageAsset>
    <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\2048X2732 .png">
      <Visible>false</Visible>
    </ImageAsset>
    <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\4096X4096.png">
      <Visible>false</Visible>
    </ImageAsset>
    <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\750X1134.png">
      <Visible>false</Visible>
    </ImageAsset>
    <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\AppIcon.appiconset\1024.png">
      <Visible>false</Visible>
    </ImageAsset>
    <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\AppIcon.appiconset\120.png">
      <Visible>false</Visible>
    </ImageAsset>
    <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\AppIcon.appiconset\152.png">
      <Visible>false</Visible>
    </ImageAsset>
    <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\AppIcon.appiconset\167.png">
      <Visible>false</Visible>
    </ImageAsset>
    <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\AppIcon.appiconset\180.png">
      <Visible>false</Visible>
    </ImageAsset>
    <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\AppIcon.appiconset\20.png">
      <Visible>false</Visible>
    </ImageAsset>
    <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\AppIcon.appiconset\29.png">
      <Visible>false</Visible>
    </ImageAsset>
    <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\AppIcon.appiconset\40.png">
      <Visible>false</Visible>
    </ImageAsset>
    <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\AppIcon.appiconset\58.png">
      <Visible>false</Visible>
    </ImageAsset>
    <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\AppIcon.appiconset\60.png">
      <Visible>false</Visible>
    </ImageAsset>
    <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\AppIcon.appiconset\76.png">
      <Visible>false</Visible>
    </ImageAsset>
    <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\AppIcon.appiconset\80.png">
      <Visible>false</Visible>
    </ImageAsset>
    <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\AppIcon.appiconset\87.png">
      <Visible>false</Visible>
    </ImageAsset>
    <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\AppIcon.appiconset\Contents.json">
      <Visible>false</Visible>
    </ImageAsset>
    <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\Contents.json">
      <Visible>false</Visible>
    </ImageAsset>
    <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\40·40%402x.png">
      <Visible>false</Visible>
    </ImageAsset>
    <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\60·60%403x.png">
      <Visible>false</Visible>
    </ImageAsset>
    <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\58·58%402x.png">
      <Visible>false</Visible>
    </ImageAsset>
    <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\87·87%403x.png">
      <Visible>false</Visible>
    </ImageAsset>
    <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\80·80%402x.png">
      <Visible>false</Visible>
    </ImageAsset>
    <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\120·120%402x.png">
      <Visible>false</Visible>
    </ImageAsset>
    <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\120·120%403x.png">
      <Visible>false</Visible>
    </ImageAsset>
    <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\180·180%403x.png">
      <Visible>false</Visible>
    </ImageAsset>
    <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\20·20.png">
      <Visible>false</Visible>
    </ImageAsset>
    <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\40·40%402x-1.png">
      <Visible>false</Visible>
    </ImageAsset>
    <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\29·29.png">
      <Visible>false</Visible>
    </ImageAsset>
    <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\58·58%402x-1.png">
      <Visible>false</Visible>
    </ImageAsset>
    <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\1024·1024%402x.png">
      <Visible>false</Visible>
    </ImageAsset>
    <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1242_2688.png">
      <Visible>false</Visible>
    </ImageAsset>
    <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\828_1792.png">
      <Visible>false</Visible>
    </ImageAsset>
    <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\2688_1242.png">
      <Visible>false</Visible>
    </ImageAsset>
    <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1792_828.png">
      <Visible>false</Visible>
    </ImageAsset>
    <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1125_2436.png">
      <Visible>false</Visible>
    </ImageAsset>
    <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\2436_1125.png">
      <Visible>false</Visible>
    </ImageAsset>
    <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1242_2208.png">
      <Visible>false</Visible>
    </ImageAsset>
    <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\750_1334.png">
      <Visible>false</Visible>
    </ImageAsset>
    <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\2208_1242.png">
      <Visible>false</Visible>
    </ImageAsset>
    <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\640_960.png">
      <Visible>false</Visible>
    </ImageAsset>
    <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\320_480.png">
      <Visible>false</Visible>
    </ImageAsset>
    <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\640_960-1.png">
      <Visible>false</Visible>
    </ImageAsset>
    <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\640_1136.png">
      <Visible>false</Visible>
    </ImageAsset>
    <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\640_1136-1.png">
      <Visible>false</Visible>
    </ImageAsset>
        <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Contents.json" />
        <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1024x500.png" />
        <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\2048X2732 .png" />
        <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\4096X4096.png" />
        <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\750X1134.png" />
        <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\AppIcon.appiconset\1024.png" />
        <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\AppIcon.appiconset\120.png" />
        <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\AppIcon.appiconset\152.png" />
        <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\AppIcon.appiconset\167.png" />
        <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\AppIcon.appiconset\180.png" />
        <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\AppIcon.appiconset\20.png" />
        <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\AppIcon.appiconset\29.png" />
        <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\AppIcon.appiconset\40.png" />
        <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\AppIcon.appiconset\58.png" />
        <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\AppIcon.appiconset\60.png" />
        <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\AppIcon.appiconset\76.png" />
        <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\AppIcon.appiconset\80.png" />
        <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\AppIcon.appiconset\87.png" />
        <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\AppIcon.appiconset\Contents.json" />
        <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\Contents.json" />
        <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\40·40%402x.png" />
        <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\60·60%403x.png" />
        <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\58·58%402x.png" />
        <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\87·87%403x.png" />
        <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\80·80%402x.png" />
        <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\120·120%402x.png" />
        <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\120·120%403x.png" />
        <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\180·180%403x.png" />
        <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\20·20.png" />
        <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\40·40%402x-1.png" />
        <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\29·29.png" />
        <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\58·58%402x-1.png" />
        <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\1024·1024%402x.png" />
        <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1242*2688.png" />
        <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\828*1792.png" />
        <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\2688*1242.png" />
        <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1792*828.png" />
        <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1125*2436.png" />
        <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\2436*1125.png" />
        <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1242*2208.png" />
        <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\750*1334.png" />
        <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\2208*1242.png" />
        <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\640*960.png" />
        <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\320*480.png" />
        <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\640*960-1.png" />
        <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\640*1136.png" />
        <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\640*1136-1.png" />
  </ItemGroup>
  <ItemGroup>
        <Folder Include="Resources\" />
        <Folder Include="Resources\Phone\" />
    <Folder Include="Assets.xcassets\LaunchImage.launchimage\" />
        <Folder Include="Resources\Phone\Public\" />
        <Folder Include="Resources\Phone\PersonalCenter\" />
        <Folder Include="Resources\Phone\Navigation\" />
        <Folder Include="Resources\Phone\PersonalCenter\PersonalData\" />
        <Folder Include="Resources\Phone\Classification\" />
        <Folder Include="Resources\Phone\Classification\Room\" />
        <Folder Include="Resources\Phone\Collection\" />
        <Folder Include="Resources\Phone\Public\DeviceInfoIcon\" />
        <Folder Include="Resources\Phone\FunctionIcon\" />
        <Folder Include="Resources\Phone\FunctionIcon\Scene\" />
        <Folder Include="Resources\Phone\Public\MsgIcon\" />
        <Folder Include="Resources\Phone\PersonalCenter\AppUnlockSetting\" />
        <Folder Include="Resources\Phone\FunctionIcon\Electrical\" />
        <Folder Include="Resources\Phone\FunctionIcon\Socket\" />
        <Folder Include="Resources\Phone\FunctionIcon\EnvironmentalScience\" />
        <Folder Include="Resources\Phone\Public\AirIcon\" />
        <Folder Include="Resources\Phone\PersonalCenter\ResetPassword\" />
        <Folder Include="Resources\Phone\Intelligence\Gallery\" />
        <Folder Include="Resources\Phone\FunctionIcon\DeviceIcon\" />
        <Folder Include="Other\" />
  </ItemGroup>
  <ItemGroup>
    <InterfaceDefinition Include="LaunchScreen.storyboard" />
@@ -701,13 +629,12 @@
    <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" />
    <ITunesArtwork Include="iTunesArtwork%402x" />
  </ItemGroup>
  <ItemGroup>
    <BundleResource Include="Resources\Phone\ErrorIcon.png" />
  </ItemGroup>
  <Import Project="..\HDL_ON\HDL_ON.projitems" Label="Shared" Condition="Exists('..\HDL_ON\HDL_ON.projitems')" />
  <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />