From 0b5b6ec781a8cb3400ad34693792bad07e97a00c Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期四, 30 六月 2022 09:32:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/release0123' into wjc
---
HDL-ON_iOS/HDL-ON_iOS.csproj | 38 +++++++++++++++++++++++++++++++-------
1 files changed, 31 insertions(+), 7 deletions(-)
diff --git a/HDL-ON_iOS/HDL-ON_iOS.csproj b/HDL-ON_iOS/HDL-ON_iOS.csproj
index 97b08bc..78e6c1e 100644
--- a/HDL-ON_iOS/HDL-ON_iOS.csproj
+++ b/HDL-ON_iOS/HDL-ON_iOS.csproj
@@ -38,8 +38,9 @@
<WarningLevel>4</WarningLevel>
<MtouchLink>SdkOnly</MtouchLink>
<MtouchArch>x86_64</MtouchArch>
-<CodesignKey>iPhone Developer</CodesignKey>
+<CodesignKey>Apple Distribution: HDL Automation Co., Ltd (BVTA78PRYA)</CodesignKey>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+<CodesignProvision>ComHdlOnProAdHoc20220117-1</CodesignProvision>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhone' ">
<DebugSymbols>true</DebugSymbols>
@@ -56,9 +57,9 @@
<MtouchLink>SdkOnly</MtouchLink>
<MtouchExtraArgs>-gcc_flags="-dead_strip -ObjC"</MtouchExtraArgs>
<MtouchEnableSGenConc>false</MtouchEnableSGenConc>
-<CodesignProvision>OnPro211201-1-Dev</CodesignProvision>
<CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+<CodesignProvision>OnPro220307-2-Dev</CodesignProvision>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhone' ">
<DebugType>none</DebugType>
@@ -68,7 +69,7 @@
<WarningLevel>4</WarningLevel>
<CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
<MtouchArch>ARM64</MtouchArch>
- <CodesignKey>Apple Distribution: HDL Automation Co., Ltd (BVTA78PRYA)</CodesignKey>
+ <CodesignKey>iPhone Distribution: HDL Automation Co., Ltd (BVTA78PRYA)</CodesignKey>
<MtouchLink>SdkOnly</MtouchLink>
<MtouchExtraArgs>-gcc_flags="-dead_strip -ObjC"</MtouchExtraArgs>
<MtouchI18n>cjk</MtouchI18n>
@@ -108,10 +109,7 @@
<HintPath>..\DLL\Linphone\iOS\Shared.IOS.HDLLinphoneSDK.dll</HintPath>
</Reference>
<Reference Include="Shared.IOS.HDLSceneSiri">
- <HintPath>..\..\HDLXamarinSceneSiri\Shared.IOS.HDLSceneSiri\Shared.IOS.HDLSceneSiri\bin\Release\Shared.IOS.HDLSceneSiri.dll</HintPath>
- </Reference>
- <Reference Include="UMSdk">
- <HintPath>..\DLL\UMeng\UMSdk.dll</HintPath>
+ <HintPath>..\DLL\IOS\Shared.IOS.HDLSceneSiri.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
@@ -487,6 +485,8 @@
<Folder Include="Resources\Phone\PersonalCenter\FacePassage\" />
<Folder Include="Resources\Phone\FunctionIcon\Electrical\AirSwitch\" />
<Folder Include="Base.lproj\" />
+ <Folder Include="Resources\Phone\FunctionIcon\CAC\" />
+ <Folder Include="Resources\Phone\FunctionIcon\Panel\" />
</ItemGroup>
<ItemGroup>
<InterfaceDefinition Include="LaunchScreen.storyboard" />
@@ -1387,6 +1387,26 @@
<BundleResource Include="Resources\Phone\FunctionIcon\EnvironmentalScience\HistoryOpionBg2.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\EnvironmentalScience\HistoryOpionBg3.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\EnvironmentalScience\HistoryOpionBg4.png" />
+ <BundleResource Include="Resources\Phone\Collection\FunctionOfflineBg.png" />
+ <BundleResource Include="Resources\Phone\Public\MsgIcon\CallIcon.png" />
+ <BundleResource Include="Resources\Phone\Public\MsgIcon\AnswerIcon.png" />
+ <BundleResource Include="Resources\Phone\Public\MsgIcon\HangUpIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\CAC\DataIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\CAC\JinMaoIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\hvaccac.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\hvaccac_blue.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\hvaccac_white.png" />
+ <BundleResource Include="Resources\Phone\Public\dialogBg2.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\sensorhelp.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\sensorhelp_blue.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\sensorhelp_white.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Panel\PanelHelpAlarmBgIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Panel\PanelHelpNormalBgIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\screenpanel.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Panel\PanelEnviBg.png" />
+ <BundleResource Include="Resources\Phone\MusicIcon\order.png" />
+ <BundleResource Include="Resources\Phone\MusicIcon\single_cycle.png" />
+ <BundleResource Include="Resources\Phone\Public\ThumbImage2.png" />
</ItemGroup>
<ItemGroup>
<ITunesArtwork Include="iTunesArtwork" />
@@ -1431,6 +1451,10 @@
<Project>{8B1652FA-5158-4D57-B90D-07BB91766625}</Project>
<Name>SiriKit</Name>
</ProjectReference>
+ <ProjectReference Include="..\UMSdk\UMSdk.csproj">
+ <Project>{5CD1B2DE-1ABD-4B46-8C97-CCB6EA90346A}</Project>
+ <Name>UMSdk</Name>
+ </ProjectReference>
</ItemGroup>
<ItemGroup>
<Content Include="Base.lproj\Intents.intentdefinition" />
--
Gitblit v1.8.0