From aa8a3dcb1cb921c9f721aac4c9c87c696ce8a354 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 30 三月 2021 09:19:10 +0800
Subject: [PATCH] Merge branch 'dev-tzy' into temp-wxr
---
HDL-ON_iOS/HDL-ON_iOS.csproj | 29 ++++++++++++++++++++++++++---
1 files changed, 26 insertions(+), 3 deletions(-)
diff --git a/HDL-ON_iOS/HDL-ON_iOS.csproj b/HDL-ON_iOS/HDL-ON_iOS.csproj
index 2cf6254..c2f83ed 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>
@@ -444,6 +446,7 @@
<Folder Include="Resources\Phone\FunctionIcon\ArmSensor\" />
<Folder Include="Resources\Phone\FunctionIcon\Electrical\ClothesHanger\" />
<Folder Include="Resources\Phone\FunctionIcon\EnvirSensor\" />
+ <Folder Include="Resources\Phone\FunctionIcon\Energy\" />
</ItemGroup>
<ItemGroup>
<InterfaceDefinition Include="LaunchScreen.storyboard" />
@@ -471,7 +474,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 +1195,27 @@
<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" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Energy\EnergyDrodDownIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\AirFresh\VentilateSelect.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\AirFresh\EnergySelect.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\AirFresh\Fan2Select.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\AirFresh\Fan3.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\AirFresh\Energy.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\AirFresh\Fan2.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\AirFresh\ComfortableSelect.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\AirFresh\Fan1.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\AirFresh\Fan3Select.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\AirFresh\TempAndHumiBack.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\AirFresh\Comfortable.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\AirFresh\Humidification.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\AirFresh\HumidificationSelect.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\AirFresh\Ventilate.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\AirFresh\Fan1Select.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\Fan\DialogTitleMenuGroud2.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\airFreshjinmao.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\airFreshjinmao_blue.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\airFreshjinmao_white.png" />
</ItemGroup>
<ItemGroup>
<ITunesArtwork Include="iTunesArtwork" />
--
Gitblit v1.8.0