From 30d5375178a275abd2019f2e5ce0eab1dfa51e0e Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期一, 16 三月 2020 09:50:03 +0800
Subject: [PATCH] 2020-03-16 1.Android 修改包名为com.hdl.crabtreenew.
---
Crabtree/ON.Ios/ON.Ios.csproj | 31 +++++++++++++++++++++----------
1 files changed, 21 insertions(+), 10 deletions(-)
diff --git a/Crabtree/ON.Ios/ON.Ios.csproj b/Crabtree/ON.Ios/ON.Ios.csproj
index a35f8ff..ee4a8de 100644
--- a/Crabtree/ON.Ios/ON.Ios.csproj
+++ b/Crabtree/ON.Ios/ON.Ios.csproj
@@ -47,7 +47,7 @@
<MtouchExtraArgs>-gcc_flags="-dead_strip -ObjC"</MtouchExtraArgs>
<CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>
<DeviceSpecificBuild>true</DeviceSpecificBuild>
-<CodesignProvision>Automatic:AdHoc</CodesignProvision>
+<CodesignProvision>HDL-ON-AdHoc-1126</CodesignProvision>
<CodesignProvision>HDL-ON-AdHoc-1126</CodesignProvision>
<CodesignProvision>HDL-ON-AdHoc-1126</CodesignProvision>
<NoStdLib>false</NoStdLib>
@@ -59,12 +59,13 @@
<DefineConstants>__IOS__;__MOBILE__;__UNIFIED__;HDL</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
- <CodesignKey>iPhone Distribution: Havells India Limited (6FQDUKMB48)</CodesignKey>
+ <CodesignKey>Apple Development: xuebiao huang (4P32GXQWWK)</CodesignKey>
<MtouchLink>None</MtouchLink>
<MtouchArch>i386</MtouchArch>
<MtouchHttpClientHandler>HttpClientHandler</MtouchHttpClientHandler>
<MtouchTlsProvider>Default</MtouchTlsProvider>
<MtouchI18n>cjk</MtouchI18n>
+ <CodesignProvision>iOS Team Provisioning Profile: com.hdl.SimpleControl</CodesignProvision>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhone' ">
<DebugSymbols>true</DebugSymbols>
@@ -76,7 +77,7 @@
<WarningLevel>4</WarningLevel>
<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
<DocumentationFile></DocumentationFile>
- <CodesignKey>iPhone Developer: xuebiao huang (4P32GXQWWK)</CodesignKey>
+ <CodesignKey>iPhone Developer</CodesignKey>
<MtouchFastDev>true</MtouchFastDev>
<MtouchFastDev>true</MtouchFastDev>
<MtouchProfiling>false</MtouchProfiling>
@@ -92,7 +93,6 @@
<CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>
<MtouchNoSymbolStrip>true</MtouchNoSymbolStrip>
<SignAssembly>true</SignAssembly>
-<CodesignProvision>On_Dev</CodesignProvision>
<IntermediateOutputPath></IntermediateOutputPath>
<RunWithWarnings>true</RunWithWarnings>
<CrashReportingDelay>-1</CrashReportingDelay>
@@ -107,7 +107,6 @@
<WarningsNotAsErrors></WarningsNotAsErrors>
<OnDemandResourcesInitialInstallTags></OnDemandResourcesInitialInstallTags>
<OnDemandResourcesPrefetchOrder></OnDemandResourcesPrefetchOrder>
-<CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
@@ -117,7 +116,7 @@
<Reference Include="System.Web.Services" />
<Reference Include="System.Net" />
<Reference Include="Newtonsoft.Json">
- <HintPath>..\packages\Newtonsoft.Json.11.0.2\lib\netstandard2.0\Newtonsoft.Json.dll</HintPath>
+ <HintPath>..\packages\Newtonsoft.Json.12.0.3\lib\netstandard2.0\Newtonsoft.Json.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="Microsoft.CSharp" />
@@ -158,6 +157,18 @@
</Reference>
<Reference Include="Xamarin.Essentials">
<HintPath>..\packages\Xamarin.Essentials.1.0.0\lib\xamarinios10\Xamarin.Essentials.dll</HintPath>
+ </Reference>
+ <Reference Include="MQTTnet">
+ <HintPath>..\packages\MQTTnet.3.0.8\lib\netstandard2.0\MQTTnet.dll</HintPath>
+ </Reference>
+ <Reference Include="MJRefresh_Xamarin">
+ <HintPath>..\SmartHome\dll\IOS\MJRefresh_Xamarin.dll</HintPath>
+ </Reference>
+ <Reference Include="Shared.IOS">
+ <HintPath>..\SmartHome\dll\IOS\Shared.IOS.dll</HintPath>
+ </Reference>
+ <Reference Include="Shared.IOS.TBL">
+ <HintPath>..\SmartHome\dll\IOS\Shared.IOS.TBL.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
@@ -979,6 +990,10 @@
<BundleResource Include="Resources\Phone2\TVNum0.png" />
<BundleResource Include="Resources\Phone2\DownIRCodeIcon.png" />
<BundleResource Include="Resources\Phone2\TV\DownIRCodeIcon.png" />
+ <BundleResource Include="Resources\Phone2\CrabtreeAdd\FromSharing.png" />
+ <BundleResource Include="Resources\Phone2\CrabtreeAdd\Logout.png" />
+ <BundleResource Include="Resources\Phone2\CrabtreeAdd\WiFiOffline.png" />
+ <BundleResource Include="Resources\Phone2\CrabtreeAdd\CloudOffline.png" />
</ItemGroup>
<ItemGroup>
<InterfaceDefinition Include="AddDevice.storyboard" />
@@ -1426,10 +1441,6 @@
<ProjectReference Include="..\IosService\IosService.csproj">
<Project>{0F9672A4-CD14-43CD-BCAD-FDA522E932F7}</Project>
<Name>IosService</Name>
- </ProjectReference>
- <ProjectReference Include="..\Shared.IOS\Shared.IOS.csproj">
- <Project>{0048AB87-2130-4437-8F01-8CADAB787004}</Project>
- <Name>Shared.IOS</Name>
</ProjectReference>
</ItemGroup>
<Import Project="..\SmartHome\SmartHome.projitems" Label="Shared" Condition="Exists('..\SmartHome\SmartHome.projitems')" />
--
Gitblit v1.8.0