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

JLChen

2021-02-05 1a0a7f736c6d2e7129e7591d40bed67ec7c0f09a

 HDL-ON_iOS/HDL-ON_iOS.csproj

@@ -54,6 +54,7 @@
        <MtouchExtraArgs>-gcc_flags="-dead_strip -ObjC"</MtouchExtraArgs>
        <MtouchEnableSGenConc>false</MtouchEnableSGenConc>
<CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
        <CodesignProvision>ComHdlOnProDevelopment20210116-2</CodesignProvision>
    </PropertyGroup>
    <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhone' ">
        <DebugType>none</DebugType>
@@ -90,7 +91,7 @@
          <HintPath>..\DLL\IOS\Shared.IOS.JLCountryCode.dll</HintPath>
        </Reference>
        <Reference Include="EZSDK.IOS">
          <HintPath>..\..\Xamarin控件库\EZOpenSDK\EZSDK.IOS\EZSDK.IOS\bin\Release\EZSDK.IOS.dll</HintPath>
          <HintPath>..\DLL\IOS\EZSDK.IOS.dll</HintPath>
        </Reference>
    </ItemGroup>
    <ItemGroup>
@@ -120,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" />
@@ -487,6 +441,7 @@
        <Folder Include="Resources\Phone\FunctionIcon\DeviceIcon\" />
        <Folder Include="Other\" />
        <Folder Include="Resources\zh-Hans.lproj\" />
        <Folder Include="Resources\Phone\FunctionIcon\Electrical\WaterValve\" />
    </ItemGroup>
    <ItemGroup>
        <InterfaceDefinition Include="LaunchScreen.storyboard" />
@@ -514,6 +469,7 @@
        <Compile Include="ZXingOverlayView.cs" />
        <Compile Include="Other\JLCountrycode.cs" />
        <Compile Include="BlueWifi.cs" />
        <Compile Include="Other\ESVideo.cs" />
    </ItemGroup>
    <ItemGroup>
      <BundleResource Include="Resources\Phone\LoginIcon\ShowPasswordIcon.png" />
@@ -1023,6 +979,20 @@
      <BundleResource Include="Resources\en.lproj\EZMain.strings" />
      <BundleResource Include="Resources\zh-Hans.lproj\AddDevice.strings" />
      <BundleResource Include="Resources\zh-Hans.lproj\EZMain.strings" />
      <BundleResource Include="Resources\Phone\tuya_logo.png" />
      <BundleResource Include="Resources\Phone\PersonalCenter\UserTypebg2.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\WaterValve\WaterValveIcon.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\WaterValve\WaterValveBg.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\WaterValve\WaterValveOnBg.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\WaterValve\ref.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\HomePageIcon\WaterValveIcon.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\HomePageIcon\WeepRobotIconOn.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\HomePageIcon\AirCleanerIconOn.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\HomePageIcon\FanIcon.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\HomePageIcon\WeepRobotIcon.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\HomePageIcon\WaterValveIconOn.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\HomePageIcon\FanIconOn.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\HomePageIcon\AirCleanerIcon.png" />
    </ItemGroup>
    <ItemGroup>
      <ITunesArtwork Include="iTunesArtwork" />
@@ -1034,6 +1004,40 @@
        <Name>Blufi</Name>
      </ProjectReference>
    </ItemGroup>
    <ItemGroup>
      <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Contents.json" />
      <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\40x40.png" />
      <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\60x60.png" />
      <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\58x58.png" />
      <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\87x87.png" />
      <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\80x80.png" />
      <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\120x120.png" />
      <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\120x120-1.png" />
      <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\180.png" />
      <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\20x20.png" />
      <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\40x40-1.png" />
      <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\29x29.png" />
      <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\58x58-1.png" />
      <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\40x40-2.png" />
      <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\80x80-1.png" />
      <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\.DS_Store" />
      <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\Contents.json" />
      <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\1024.png" />
      <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\12422688.png" />
      <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\8281792.png" />
      <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\26881242.png" />
      <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1792828.png" />
      <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\11252436.png" />
      <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\24361125.png" />
      <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\12422208.png" />
      <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\7501334.png" />
      <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\640960.png" />
      <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\6401136.png" />
      <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\22081242.png" />
      <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\320480.png" />
      <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\640960-1.png" />
      <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\6401136-1.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" />
    <ProjectExtensions>