From 9acd3887f1f8db40d59f991b1726a61aa7c7637c Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 12 五月 2021 15:13:56 +0800
Subject: [PATCH] Merge branch 'CJL' into wxr4
---
HDL-ON_iOS/HDL-ON_iOS.csproj | 29 ++++++++++++++++++++++++-----
1 files changed, 24 insertions(+), 5 deletions(-)
diff --git a/HDL-ON_iOS/HDL-ON_iOS.csproj b/HDL-ON_iOS/HDL-ON_iOS.csproj
index f48a23a..79a3830 100644
--- a/HDL-ON_iOS/HDL-ON_iOS.csproj
+++ b/HDL-ON_iOS/HDL-ON_iOS.csproj
@@ -27,6 +27,7 @@
<MtouchDebug>true</MtouchDebug>
<CodesignKey>iPhone Developer</CodesignKey>
<MtouchExtraArgs>-gcc_flags="-dead_strip -ObjC";-w</MtouchExtraArgs>
+ <CodesignProvision>On+Dev-20210428-1</CodesignProvision>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhoneSimulator' ">
<DebugType>none</DebugType>
@@ -54,7 +55,7 @@
<MtouchExtraArgs>-gcc_flags="-dead_strip -ObjC"</MtouchExtraArgs>
<MtouchEnableSGenConc>false</MtouchEnableSGenConc>
<CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
-<CodesignProvision>ComHdlOnProDevelopment20210305-1</CodesignProvision>
+<CodesignProvision>On+Dev-20210510-1</CodesignProvision>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhone' ">
<DebugType>none</DebugType>
@@ -78,10 +79,6 @@
<Reference Include="System.Numerics" />
<Reference Include="System.Numerics.Vectors" />
<Reference Include="System.Web.Services" />
- <Reference Include="Shared.IOS">
- <HintPath>..\DLL\Shared.IOS.dll</HintPath>
- <Private>False</Private>
- </Reference>
<Reference Include="Shared.IOS.TBL">
<HintPath>..\DLL\Shared.IOS.TBL.dll</HintPath>
<Private>False</Private>
@@ -97,6 +94,9 @@
</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>
</ItemGroup>
<ItemGroup>
@@ -1219,6 +1219,25 @@
<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" />
+ <BundleResource Include="Resources\Phone\Public\RightSlideBackIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\ArmCenter\DisasterAlarmIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\ArmCenter\InDefenseBigIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\ArmCenter\AddDefenseIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\ArmCenter\HouseDefenseIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\ArmCenter\HolidayDefenseIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\ArmCenter\AtHomeDefenseIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\ArmCenter\AtHomeDefenseIconOn.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\ArmCenter\NoDefenseBigIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\ArmCenter\HolidayDefenseIconOn.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\ArmCenter\HouseDefenseIconOn.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\ArmCenter\BurglarAlarmIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\ArmCenter\HistoryIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\FunctionBg\SecurityCenterFunctionBg.png" />
+ <BundleResource Include="Resources\Phone\LogicIcon\shiwaitianqi.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Curtain\CurtainDownIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Curtain\CurtainDownIconOn.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Curtain\CurtainUpIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Curtain\CurtainUpIconOn.png" />
<BundleResource Include="Resources\Phone\PersonalCenter\SmartSpeaker.png" />
</ItemGroup>
<ItemGroup>
--
Gitblit v1.8.0