From f676a4c180fc54cc82eecbfcd24d32fe7d8581db Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 26 三月 2021 18:16:58 +0800
Subject: [PATCH] Merge branch 'CJL' into temp-wxr
---
HDL-ON_iOS/HDL-ON_iOS.csproj | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/HDL-ON_iOS/HDL-ON_iOS.csproj b/HDL-ON_iOS/HDL-ON_iOS.csproj
index 2cf6254..e8ec69f 100644
--- a/HDL-ON_iOS/HDL-ON_iOS.csproj
+++ b/HDL-ON_iOS/HDL-ON_iOS.csproj
@@ -54,7 +54,7 @@
<MtouchExtraArgs>-gcc_flags="-dead_strip -ObjC"</MtouchExtraArgs>
<MtouchEnableSGenConc>false</MtouchEnableSGenConc>
<CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
-<CodesignProvision>ComHdlOnProDevelopment20210305-1</CodesignProvision>
+<CodesignProvision>ComHdlOnProDevelopment20210225-1</CodesignProvision>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhone' ">
<DebugType>none</DebugType>
@@ -64,8 +64,7 @@
<WarningLevel>4</WarningLevel>
<CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
<MtouchArch>ARM64</MtouchArch>
- <CodesignKey>iPhone Distribution: HDL Automation Co., Ltd (BVTA78PRYA)</CodesignKey>
- <CodesignProvision>Automatic:AdHoc</CodesignProvision>
+ <CodesignKey>Apple Distribution: HDL Automation Co., Ltd (BVTA78PRYA)</CodesignKey>
<MtouchLink>SdkOnly</MtouchLink>
</PropertyGroup>
<ItemGroup>
@@ -92,6 +91,9 @@
</Reference>
<Reference Include="EZSDK.IOS">
<HintPath>..\DLL\IOS\EZSDK.IOS.dll</HintPath>
+ </Reference>
+ <Reference Include="Shared.IOS.ESVideoOnSDK">
+ <HintPath>..\DLL\FL\iOS\Shared.IOS.ESVideoOnSDK.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
@@ -471,7 +473,6 @@
<Compile Include="ZXingOverlayView.cs" />
<Compile Include="Other\JLCountrycode.cs" />
<Compile Include="BlueWifi.cs" />
- <Compile Include="Other\ESVideo.cs" />
</ItemGroup>
<ItemGroup>
<BundleResource Include="Resources\Phone\LoginIcon\ShowPasswordIcon.png" />
@@ -1193,6 +1194,7 @@
<BundleResource Include="Resources\Phone\FunctionIcon\EnvirSensor\TempIcon.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\EnvirSensor\TvocIcon.png" />
<BundleResource Include="Resources\Phone\PirIcon\add.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\AC\More.png" />
</ItemGroup>
<ItemGroup>
<ITunesArtwork Include="iTunesArtwork" />
--
Gitblit v1.8.0