From 25429f085093d89d543a0b90e30d0d62d1b7dac9 Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期二, 30 八月 2022 09:37:38 +0800
Subject: [PATCH] 合并了IOS的代码
---
ZigbeeApp/Home.Ios/Home.IOS.csproj | 46 ++++++++++++++++++++++++++--------------------
1 files changed, 26 insertions(+), 20 deletions(-)
diff --git a/ZigbeeApp/Home.Ios/Home.IOS.csproj b/ZigbeeApp/Home.Ios/Home.IOS.csproj
index 4654b66..8d78e92 100644
--- a/ZigbeeApp/Home.Ios/Home.IOS.csproj
+++ b/ZigbeeApp/Home.Ios/Home.IOS.csproj
@@ -25,6 +25,7 @@
<MtouchArch>x86_64</MtouchArch>
<MtouchLink>None</MtouchLink>
<MtouchDebug>true</MtouchDebug>
+<CodesignKey>iPhone Developer</CodesignKey>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhoneSimulator' ">
<DebugType>none</DebugType>
@@ -52,13 +53,16 @@
<CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
<CodesignKey>iPhone Developer</CodesignKey>
<MtouchDebug>true</MtouchDebug>
- <MtouchExtraArgs>-gcc_flags -dead_strip</MtouchExtraArgs>
<MtouchI18n>cjk</MtouchI18n>
-<CodesignProvision>ComEvoyoHomeDevelopment20200806</CodesignProvision>
-<MtouchHttpClientHandler>CFNetworkHandler</MtouchHttpClientHandler>
+<MtouchHttpClientHandler>NSUrlSessionHandler</MtouchHttpClientHandler>
<OnDemandResourcesInitialInstallTags></OnDemandResourcesInitialInstallTags>
<OnDemandResourcesInitialInstallTags></OnDemandResourcesInitialInstallTags>
<OnDemandResourcesPrefetchOrder></OnDemandResourcesPrefetchOrder>
+<MtouchLink>SdkOnly</MtouchLink>
+<CodesignProvision>ComEvoyoHomeDevelopment</CodesignProvision>
+<MtouchEnableSGenConc>true</MtouchEnableSGenConc>
+<MtouchFastDev>true</MtouchFastDev>
+<MtouchExtraArgs>-gcc_flags="-dead_strip -ObjC"</MtouchExtraArgs>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhone' ">
<DebugType>none</DebugType>
@@ -69,11 +73,12 @@
<WarningLevel>4</WarningLevel>
<CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
<MtouchArch>ARM64</MtouchArch>
- <CodesignKey>iPhone Developer: xuebiao huang (4P32GXQWWK)</CodesignKey>
+ <CodesignKey>iPhone Distribution: HDL Automation Co., Ltd (BVTA78PRYA)</CodesignKey>
<MtouchI18n>cjk</MtouchI18n>
<DeviceSpecificBuild>true</DeviceSpecificBuild>
<MtouchExtraArgs>-gcc_flags -dead_strip</MtouchExtraArgs>
- <CodesignProvision>ComEvoyoHomeDevelopment20200806</CodesignProvision>
+ <MtouchLink>SdkOnly</MtouchLink>
+<CodesignProvision>ComEvoyoHomeAppStore0301</CodesignProvision>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
@@ -82,12 +87,6 @@
<Reference Include="Xamarin.iOS" />
<Reference Include="System.Numerics" />
<Reference Include="System.Numerics.Vectors" />
- <Reference Include="Shared.IOS">
- <HintPath>..\Shared\DLL\IOS\Shared.IOS.dll</HintPath>
- </Reference>
- <Reference Include="Shared.IOS.TBL">
- <HintPath>..\Shared\DLL\IOS\Shared.IOS.TBL.dll</HintPath>
- </Reference>
<Reference Include="Newtonsoft.Json">
<HintPath>..\Shared\DLL\Newtonsoft.Json.dll</HintPath>
</Reference>
@@ -95,8 +94,17 @@
<HintPath>..\packages\BouncyCastle.Crypto.dll.1.8.1\lib\BouncyCastle.Crypto.dll</HintPath>
</Reference>
<Reference Include="System.Net.Http" />
- <Reference Include="Shared.IOS.ESVideoPhoneSDK">
- <HintPath>..\Shared\DLL\IOS\Shared.IOS.ESVideoPhoneSDK.dll</HintPath>
+ <Reference Include="Shared.IOS.TBL">
+ <HintPath>..\..\..\Library\Shared.IOS.TBL\bin\Debug\Shared.IOS.TBL.dll</HintPath>
+ </Reference>
+ <Reference Include="Shared.IOS">
+ <HintPath>..\Shared\DLL\IOS\Shared.IOS.dll</HintPath>
+ </Reference>
+ <Reference Include="Elian.iOS">
+ <HintPath>..\Shared\DLL\Elian.iOS.dll</HintPath>
+ </Reference>
+ <Reference Include="Shared.IOS.HDLFVSDK">
+ <HintPath>..\Shared\DLL\IOS\Shared.IOS.HDLFVSDK.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
@@ -111,10 +119,13 @@
<Version>2.6.1</Version>
</PackageReference>
<PackageReference Include="Microsoft.AppCenter">
- <Version>2.6.1</Version>
+ <Version>3.0.0</Version>
</PackageReference>
<PackageReference Include="Microsoft.AppCenter.Analytics">
<Version>2.6.1</Version>
+ </PackageReference>
+ <PackageReference Include="kyub.org.bouncycastle.dtlssrtp">
+ <Version>1.0.1</Version>
</PackageReference>
</ItemGroup>
<ItemGroup>
@@ -144,12 +155,6 @@
<Compile Include="Reachability.cs" />
<Compile Include="ZXingOverlayView.cs" />
<Compile Include="ESVideo.cs" />
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="..\Elian.iOS\Elian.iOS.csproj">
- <Project>{85F1AF50-75A6-4011-B811-56B32DA77568}</Project>
- <Name>Elian.iOS</Name>
- </ProjectReference>
</ItemGroup>
<ItemGroup>
<ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Contents.json" />
@@ -1170,6 +1175,7 @@
<BundleResource Include="Resources\Phone\Gateway\WiredGateway.png" />
<BundleResource Include="Resources\Phone\Gateway\WirelessGateway.png" />
<BundleResource Include="Resources\Phone\Gateway\AddGatewaySuccess.png" />
+ <BundleResource Include="Resources\Phone\Center\FaceManagement.png" />
</ItemGroup>
<Import Project="..\Shared\Shared.projitems" Label="Shared" Condition="Exists('..\Shared\Shared.projitems')" />
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
--
Gitblit v1.8.0