From df7dd3e3f8830eceb615c59099631fc2a744b0ee Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 27 一月 2021 17:20:42 +0800
Subject: [PATCH] Merge branch 'WJC' into NewFilePath
---
HDL-ON_iOS/HDL-ON_iOS.csproj | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/HDL-ON_iOS/HDL-ON_iOS.csproj b/HDL-ON_iOS/HDL-ON_iOS.csproj
index 9936497..b811ebc 100644
--- a/HDL-ON_iOS/HDL-ON_iOS.csproj
+++ b/HDL-ON_iOS/HDL-ON_iOS.csproj
@@ -52,6 +52,7 @@
<MtouchExtraArgs>-gcc_flags="-dead_strip -ObjC";-w</MtouchExtraArgs>
<MtouchI18n>cjk</MtouchI18n>
<MtouchLink>SdkOnly</MtouchLink>
+ <CodesignProvision>ComHdlOnProDevelopment20210116-2</CodesignProvision>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhone' ">
<DebugType>none</DebugType>
@@ -86,9 +87,6 @@
</Reference>
<Reference Include="Shared.IOS.JLCountryCode">
<HintPath>..\DLL\IOS\Shared.IOS.JLCountryCode.dll</HintPath>
- </Reference>
- <Reference Include="HdlBluWi">
- <HintPath>..\DLL\IOS\HdlBluWi.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
@@ -660,11 +658,19 @@
<BundleResource Include="Resources\Phone\Public\ListCellbg\ListCellbg5.png" />
<BundleResource Include="Resources\Phone\LogicIcon\location.png" />
<BundleResource Include="Resources\Phone\LoginIcon\changesinoutdoor.png" />
+ <BundleResource Include="Resources\Phone\PersonalCenter\UserTypebg2.png" />
+ <BundleResource Include="Resources\Phone\LogicIcon\sensor.png" />
</ItemGroup>
<ItemGroup>
<ITunesArtwork Include="iTunesArtwork" />
<ITunesArtwork Include="iTunesArtwork%402x" />
</ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="..\HdlBluWi\Blufi.csproj">
+ <Project>{2DDF4C3C-6998-432E-9F43-6786D82F0630}</Project>
+ <Name>Blufi</Name>
+ </ProjectReference>
+ </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>
--
Gitblit v1.8.0