From 70d2b7cd0c8fe5dfb29bb2baf96997575ade2bac Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期四, 08 七月 2021 18:34:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/newBranch1' into WJC
---
HDL-ON_iOS/HDL-ON_iOS.csproj | 26 ++++++++++++++++++++++----
1 files changed, 22 insertions(+), 4 deletions(-)
diff --git a/HDL-ON_iOS/HDL-ON_iOS.csproj b/HDL-ON_iOS/HDL-ON_iOS.csproj
index 97326f6..d26dc65 100644
--- a/HDL-ON_iOS/HDL-ON_iOS.csproj
+++ b/HDL-ON_iOS/HDL-ON_iOS.csproj
@@ -54,7 +54,6 @@
<MtouchLink>SdkOnly</MtouchLink>
<MtouchExtraArgs>-gcc_flags="-dead_strip -ObjC"</MtouchExtraArgs>
<MtouchEnableSGenConc>false</MtouchEnableSGenConc>
-<CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
<CodesignProvision>On+Dev-20210616-1</CodesignProvision>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhone' ">
@@ -69,7 +68,7 @@
<MtouchLink>SdkOnly</MtouchLink>
<MtouchExtraArgs>-gcc_flags="-dead_strip -ObjC"</MtouchExtraArgs>
<MtouchI18n>cjk</MtouchI18n>
- <CodesignProvision>On+_Hoc20210401-1</CodesignProvision>
+ <CodesignProvision>ComHdlOnProAdHoc20210616-1</CodesignProvision>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
@@ -92,11 +91,14 @@
<Reference Include="EZSDK.IOS">
<HintPath>..\DLL\IOS\EZSDK.IOS.dll</HintPath>
</Reference>
+ <Reference Include="Shared.IOS">
+ <HintPath>..\DLL\Shared.IOS.dll</HintPath>
+ </Reference>
<Reference Include="Shared.IOS.ESVideoOnSDK">
<HintPath>..\DLL\FL\iOS\Shared.IOS.ESVideoOnSDK.dll</HintPath>
</Reference>
- <Reference Include="Shared.IOS">
- <HintPath>..\DLL\Shared.IOS.dll</HintPath>
+ <Reference Include="Shared.IOS.LCVideoOnSDK">
+ <HintPath>..\DLL\LC\IOS\Shared.IOS.LCVideoOnSDK.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
@@ -450,6 +452,7 @@
<Folder Include="Resources\Phone\FunctionIcon\Electrical\ClothesHanger\" />
<Folder Include="Resources\Phone\FunctionIcon\EnvirSensor\" />
<Folder Include="Resources\Phone\FunctionIcon\Energy\" />
+ <Folder Include="Resources\Phone\FunctionIcon\IrFan\" />
</ItemGroup>
<ItemGroup>
<InterfaceDefinition Include="LaunchScreen.storyboard" />
@@ -1291,6 +1294,21 @@
<BundleResource Include="Resources\Phone\FunctionIcon\AC\SweepIconUD.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\AC\SweepIconUDOn.png" />
<BundleResource Include="Resources\Phone\Public\ScanGrey.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\IrFan\FanIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\IrFan\PatternIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\IrFan\PatternIconOn.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\IrFan\PowerIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\IrFan\PowerIconOn.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\IrFan\TimingIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\IrFan\TimingIconOn.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\IrFan\SpeedIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\IrFan\SpeedIconOn.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\IrFan\HeadSwingingIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\IrFan\HeadSwingingIconOn.png" />
+ <BundleResource Include="Resources\Phone\Classification\Room\AllCloseIcon2.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\irfan.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\irfan_blue.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\irfan_white.png" />
</ItemGroup>
<ItemGroup>
<ITunesArtwork Include="iTunesArtwork" />
--
Gitblit v1.8.0