From c44b10e4447e84dbdfa9105edf460ef364a8f2b3 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期一, 30 十一月 2020 19:53:35 +0800
Subject: [PATCH] Merge branch 'master' into WJC
---
HDL-ON_iOS/HDL-ON_iOS.csproj | 42 +++++++++++++++++++++++++++++++++++++-----
1 files changed, 37 insertions(+), 5 deletions(-)
diff --git a/HDL-ON_iOS/HDL-ON_iOS.csproj b/HDL-ON_iOS/HDL-ON_iOS.csproj
index 25ca707..fe64565 100644
--- a/HDL-ON_iOS/HDL-ON_iOS.csproj
+++ b/HDL-ON_iOS/HDL-ON_iOS.csproj
@@ -36,6 +36,7 @@
<WarningLevel>4</WarningLevel>
<MtouchLink>None</MtouchLink>
<MtouchArch>x86_64</MtouchArch>
+<CodesignKey>iPhone Developer</CodesignKey>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhone' ">
<DebugSymbols>true</DebugSymbols>
@@ -46,11 +47,11 @@
<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>
+ <MtouchLink>SdkOnly</MtouchLink>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhone' ">
<DebugType>none</DebugType>
@@ -62,6 +63,7 @@
<MtouchArch>ARM64</MtouchArch>
<CodesignKey>iPhone Distribution: HDL Automation Co., Ltd (BVTA78PRYA)</CodesignKey>
<CodesignProvision>dis-onpro-080401</CodesignProvision>
+ <MtouchLink>SdkOnly</MtouchLink>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
@@ -82,6 +84,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" />
@@ -89,16 +94,19 @@
<Version>12.0.2</Version>
</PackageReference>
<PackageReference Include="MQTTnet">
- <Version>3.0.8</Version>
+ <Version>3.0.13</Version>
</PackageReference>
<PackageReference Include="Microsoft.AppCenter.Analytics">
- <Version>3.1.0</Version>
+ <Version>4.0.0</Version>
</PackageReference>
<PackageReference Include="Microsoft.AppCenter.Crashes">
- <Version>3.1.0</Version>
+ <Version>4.0.0</Version>
</PackageReference>
<PackageReference Include="ZXing.Net.Mobile">
<Version>2.4.1</Version>
+ </PackageReference>
+ <PackageReference Include="RestSharp">
+ <Version>106.11.7</Version>
</PackageReference>
</ItemGroup>
<ItemGroup>
@@ -172,6 +180,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" />
@@ -192,6 +202,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" />
@@ -541,6 +552,27 @@
<BundleResource Include="Resources\Phone\FunctionIcon\AC\DiyThumbIcon2On.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\AC\HightIconGray.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\Light\BrightnessBg.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Curtain\RollingShutterIcon.png" />
+ <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" />
+ <BundleResource Include="Resources\Phone\Public\Dialog\DialogTipTitleIcon_3.png" />
+ <BundleResource Include="Resources\Phone\Public\Dialog\DialogTipTitleIcon_2.png" />
+ <BundleResource Include="Resources\Phone\Public\Dialog\DialogTipTitleIcon_1.png" />
+ <BundleResource Include="Resources\Phone\LoginIcon\Server.png" />
+ <BundleResource Include="Resources\Phone\PersonalCenter\ServerInfo.png" />
+ <BundleResource Include="Resources\Phone\PersonalCenter\Support\Function.png" />
+ <BundleResource Include="Resources\Phone\PersonalCenter\Support\Search.png" />
+ <BundleResource Include="Resources\Phone\PersonalCenter\Support\Menu.png" />
+ <BundleResource Include="Resources\Phone\PersonalCenter\Support\Help.png" />
+ <BundleResource Include="Resources\Phone\PersonalCenter\Support\Telephone.png" />
+ <BundleResource Include="Resources\Phone\PersonalCenter\Support\SendMessage.png" />
+ <BundleResource Include="Resources\Phone\PersonalCenter\Support\Scene.png" />
+ <BundleResource Include="Resources\Phone\PersonalCenter\Support\Close.png" />
+ <BundleResource Include="Resources\Phone\Public\Search.png" />
+ <BundleResource Include="Resources\Phone\PersonalCenter\Head.png" />
+ <BundleResource Include="Resources\Phone\PersonalCenter\Transfer.png" />
</ItemGroup>
<ItemGroup>
<ITunesArtwork Include="iTunesArtwork" />
--
Gitblit v1.8.0