2021-02-05 1.编译冲突修改

JLChen

2021-02-05 1a0a7f736c6d2e7129e7591d40bed67ec7c0f09a

 HDL-ON_iOS/HDL-ON_iOS.csproj

@@ -121,53 +121,6 @@
      </PackageReference>
    </ItemGroup>
    <ItemGroup>
        <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" />
        <ImageAsset Include="Assets.xcassets\add_server1.imageset\add_server1.png" />
        <ImageAsset Include="Assets.xcassets\add_server1.imageset\add_server1%402x.png" />
        <ImageAsset Include="Assets.xcassets\add_server1.imageset\Contents.json" />