From 4f8fc4fe0a7d6f73c3a06e6f924a4a2615b090d7 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期一, 05 七月 2021 10:14:01 +0800
Subject: [PATCH] Merge branch 'wxr6' into newBranch1
---
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 a639039..0dff2f0 100644
--- a/HDL-ON_iOS/HDL-ON_iOS.csproj
+++ b/HDL-ON_iOS/HDL-ON_iOS.csproj
@@ -27,7 +27,7 @@
<MtouchDebug>true</MtouchDebug>
<CodesignKey>iPhone Developer</CodesignKey>
<MtouchExtraArgs>-gcc_flags="-dead_strip -ObjC";-w</MtouchExtraArgs>
- <CodesignProvision>On+Dev-20210428-1</CodesignProvision>
+ <CodesignProvision>On+Dev-20210616-1</CodesignProvision>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhoneSimulator' ">
<DebugType>none</DebugType>
@@ -55,7 +55,7 @@
<MtouchExtraArgs>-gcc_flags="-dead_strip -ObjC"</MtouchExtraArgs>
<MtouchEnableSGenConc>false</MtouchEnableSGenConc>
<CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
-<CodesignProvision>On+Dev-20210604-1</CodesignProvision>
+<CodesignProvision>On+Dev-20210616-1</CodesignProvision>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhone' ">
<DebugType>none</DebugType>
@@ -69,7 +69,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" />
@@ -450,6 +450,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" />
@@ -1284,6 +1285,28 @@
<BundleResource Include="Resources\Phone\FunctionIcon\ArmSensor\SomeoneFellBgIcon.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\ArmSensor\SomeoneInBgIcon.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\ArmSensor\UnderProtectionBgIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\AC\SweepIconLR.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\AC\SweepIconLROn.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\AC\SweepIconNull.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\AC\SweepIconNullOn.png" />
+ <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