From e990a9737e423d7005506a569e98fb4032fceb46 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期一, 29 三月 2021 09:15:08 +0800
Subject: [PATCH] Merge branch 'temp-wxr' into WJC

---
 HDL-ON_iOS/HDL-ON_iOS.csproj |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/HDL-ON_iOS/HDL-ON_iOS.csproj b/HDL-ON_iOS/HDL-ON_iOS.csproj
index 2cf6254..48b10a5 100644
--- a/HDL-ON_iOS/HDL-ON_iOS.csproj
+++ b/HDL-ON_iOS/HDL-ON_iOS.csproj
@@ -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