From 387383a243879bf8c63a4611e2ed2c5a519e218d Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 20 十一月 2020 18:14:29 +0800
Subject: [PATCH] Merge branch 'CJL'
---
HDL-ON_iOS/HDL-ON_iOS.csproj | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/HDL-ON_iOS/HDL-ON_iOS.csproj b/HDL-ON_iOS/HDL-ON_iOS.csproj
index 10bead6..be15a71 100644
--- a/HDL-ON_iOS/HDL-ON_iOS.csproj
+++ b/HDL-ON_iOS/HDL-ON_iOS.csproj
@@ -47,10 +47,9 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<MtouchArch>ARM64</MtouchArch>
- <CodesignKey>iPhone Developer: xuebiao huang (4P32GXQWWK)</CodesignKey>
+ <CodesignKey>iPhone Developer</CodesignKey>
<MtouchDebug>true</MtouchDebug>
<MtouchExtraArgs>-gcc_flags="-dead_strip -ObjC";-w</MtouchExtraArgs>
- <CodesignProvision>onpro0804</CodesignProvision>
<MtouchI18n>cjk</MtouchI18n>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhone' ">
@@ -83,6 +82,9 @@
<Reference Include="MJRefresh_Xamarin">
<HintPath>..\DLL\IOS\MJRefresh_Xamarin.dll</HintPath>
</Reference>
+ <Reference Include="Shared.IOS.JLCountryCode">
+ <HintPath>..\DLL\IOS\Shared.IOS.JLCountryCode.dll</HintPath>
+ </Reference>
</ItemGroup>
<ItemGroup>
<PackageReference Include="Xamarin.Essentials" Version="1.1.0" />
@@ -100,6 +102,9 @@
</PackageReference>
<PackageReference Include="ZXing.Net.Mobile">
<Version>2.4.1</Version>
+ </PackageReference>
+ <PackageReference Include="RestSharp">
+ <Version>106.11.7</Version>
</PackageReference>
</ItemGroup>
<ItemGroup>
@@ -173,6 +178,8 @@
<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" />
@@ -193,6 +200,7 @@
<Compile Include="Reachability.cs" />
<Compile Include="Scan.cs" />
<Compile Include="ZXingOverlayView.cs" />
+ <Compile Include="Other\JLCountrycode.cs" />
</ItemGroup>
<ItemGroup>
<BundleResource Include="Resources\Phone\LoginIcon\ShowPasswordIcon.png" />
@@ -546,6 +554,7 @@
<BundleResource Include="Resources\Phone\FunctionIcon\Curtain\MotorCurtainIcon.png" />
<BundleResource Include="Resources\Phone\OnIcon.png" />
<BundleResource Include="Resources\Phone\TipNot.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\DeviceIcon\VoicePanelIcon.png" />
</ItemGroup>
<ItemGroup>
<ITunesArtwork Include="iTunesArtwork" />
--
Gitblit v1.8.0