From 6d73bf6e816570291865674bef8bce8972e4de3f Mon Sep 17 00:00:00 2001 From: xm <1271024303@qq.com> Date: 星期三, 01 十二月 2021 16:32:57 +0800 Subject: [PATCH] 2021-12-01-01 --- HDL-ON_iOS/HDL-ON_iOS.csproj | 77 +++++++++++++++++++++++++++++++++----- 1 files changed, 66 insertions(+), 11 deletions(-) diff --git a/HDL-ON_iOS/HDL-ON_iOS.csproj b/HDL-ON_iOS/HDL-ON_iOS.csproj index 0dff2f0..5704978 100644 --- a/HDL-ON_iOS/HDL-ON_iOS.csproj +++ b/HDL-ON_iOS/HDL-ON_iOS.csproj @@ -35,7 +35,7 @@ <OutputPath>bin\iPhoneSimulator\Release</OutputPath> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> - <MtouchLink>None</MtouchLink> + <MtouchLink>SdkOnly</MtouchLink> <MtouchArch>x86_64</MtouchArch> <CodesignKey>iPhone Developer</CodesignKey> </PropertyGroup> @@ -54,8 +54,8 @@ <MtouchLink>SdkOnly</MtouchLink> <MtouchExtraArgs>-gcc_flags="-dead_strip -ObjC"</MtouchExtraArgs> <MtouchEnableSGenConc>false</MtouchEnableSGenConc> +<CodesignProvision>OnPro211116-1</CodesignProvision> <CodesignEntitlements>Entitlements.plist</CodesignEntitlements> -<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>ComHdlOnProAdHoc20210616-1</CodesignProvision> + <CodesignProvision>OnPro-Hoc20211117-1</CodesignProvision> </PropertyGroup> <ItemGroup> <Reference Include="System" /> @@ -92,37 +92,43 @@ <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> + <Reference Include="Shared.IOS.HDLLinphoneSDK"> + <HintPath>..\DLL\Linphone\iOS\Shared.IOS.HDLLinphoneSDK.dll</HintPath> </Reference> </ItemGroup> <ItemGroup> <PackageReference Include="Newtonsoft.Json"> - <Version>12.0.3</Version> + <Version>13.0.1</Version> </PackageReference> <PackageReference Include="MQTTnet"> - <Version>3.0.13</Version> + <Version>3.0.16</Version> </PackageReference> <PackageReference Include="Microsoft.AppCenter.Analytics"> - <Version>4.1.0</Version> + <Version>4.3.0</Version> </PackageReference> <PackageReference Include="Microsoft.AppCenter.Crashes"> - <Version>4.1.0</Version> + <Version>4.3.0</Version> </PackageReference> <PackageReference Include="ZXing.Net.Mobile"> <Version>2.4.1</Version> </PackageReference> <PackageReference Include="RestSharp"> - <Version>106.11.7</Version> + <Version>106.12.0</Version> </PackageReference> <PackageReference Include="Xamarin.iOS.Bugly"> <Version>1.0.4</Version> </PackageReference> <PackageReference Include="Xamarin.Essentials"> - <Version>1.6.0</Version> + <Version>1.7.0</Version> </PackageReference> </ItemGroup> <ItemGroup> @@ -420,6 +426,8 @@ <ImageAsset Include="Assets.xcassets\wifi_bg.imageset\Contents.json" /> <ImageAsset Include="Assets.xcassets\wifi_bg.imageset\wifi_bg%402x.png" /> <ImageAsset Include="Assets.xcassets\wifi_bg.imageset\wifi_bg.png" /> + <ImageAsset Include="Assets.xcassets\device_bg.imageset\Contents.json" /> + <ImageAsset Include="Assets.xcassets\device_bg.imageset\device_bg.png" /> </ItemGroup> <ItemGroup> <Folder Include="Resources\" /> @@ -451,6 +459,10 @@ <Folder Include="Resources\Phone\FunctionIcon\EnvirSensor\" /> <Folder Include="Resources\Phone\FunctionIcon\Energy\" /> <Folder Include="Resources\Phone\FunctionIcon\IrFan\" /> + <Folder Include="Assets.xcassets\device_bg.imageset\" /> + <Folder Include="Resources\Phone\FunctionIcon\Light\LightScene\" /> + <Folder Include="Resources\Phone\PersonalCenter\FacePassage\" /> + <Folder Include="Resources\Phone\FunctionIcon\Electrical\AirSwitch\" /> </ItemGroup> <ItemGroup> <InterfaceDefinition Include="LaunchScreen.storyboard" /> @@ -1307,6 +1319,44 @@ <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" /> + <BundleResource Include="Resources\Phone\FunctionIcon\Icon\sensorenvironment.png" /> + <BundleResource Include="Resources\Phone\PersonalCenter\AddDevice\EnvironmentalSensorbg.png" /> + <BundleResource Include="Resources\Phone\FunctionIcon\AirFresh\AirFreshBgIcon.png" /> + <BundleResource Include="Resources\Phone\PersonalCenter\AddDevice\EnvirSensorQingpingCGS1bg.png" /> + <BundleResource Include="Resources\Phone\PersonalCenter\AddDevice\EnvirSensorQingpingLitebg.png" /> + <BundleResource Include="Resources\Phone\FunctionIcon\Icon\sensorenvironment2.png" /> + <BundleResource Include="Resources\Phone\FunctionIcon\Icon\sensorenvironment3.png" /> + <BundleResource Include="Resources\Phone\FunctionIcon\Light\LightScene\CheckIcon.png" /> + <BundleResource Include="Resources\Phone\FunctionIcon\Light\LightScene\CheckOnIcon.png" /> + <BundleResource Include="Resources\Phone\FunctionIcon\Light\LightScene\SetLightSceneIcon.png" /> + <BundleResource Include="Resources\Phone\FunctionIcon\ArmCenter\AddTargetIcon.png" /> + <BundleResource Include="Resources\Phone\FunctionIcon\ArmCenter\RightIcon.png" /> + <BundleResource Include="Resources\Phone\PersonalCenter\FacePassage\FaceIcon.png" /> + <BundleResource Include="Resources\Phone\Collection\DefenseStatusIcon.png" /> + <BundleResource Include="Resources\Phone\Collection\DisarmStatusIcon.png" /> + <BundleResource Include="Resources\Phone\PersonalCenter\ResidenceDefenseIcon.png" /> + <BundleResource Include="Resources\Phone\Collection\DefenseAlarmIcon.png" /> + <BundleResource Include="Resources\Phone\FunctionIcon\ArmCenter\InAlarmBigIcon.png" /> + <BundleResource Include="Resources\Phone\PersonalCenter\ResidenceInAlarmIcon.png" /> + <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\AirSwitch\AirSwitchBgIcon.png" /> + <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\AirSwitch\AirSwitchBgOnIcon.png" /> + <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\AirSwitch\EnergyIcon.png" /> + <BundleResource Include="Resources\Phone\PersonalCenter\FacePassage\FailIcon.png" /> + <BundleResource Include="Resources\Phone\PersonalCenter\FacePassage\TrueIcon.png" /> + <BundleResource Include="Resources\Phone\FunctionIcon\EnvirSensor\HchoBg.png" /> + <BundleResource Include="Resources\Phone\FunctionIcon\EnvirSensor\HchoIcon.png" /> + <BundleResource Include="Resources\Phone\FunctionIcon\Icon\sensorhcho.png" /> + <BundleResource Include="Resources\Phone\FunctionIcon\Icon\electricalbreaker.png" /> + <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\electricalbreaker_blue.png" /> + <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\electricalbreaker_white.png" /> + <BundleResource Include="Resources\Phone\LogicIcon\security.png" /> + <BundleResource Include="Resources\Phone\Public\HookIcon.png" /> + <BundleResource Include="Resources\Phone\Collection\MesCenter\Property.png" /> + <BundleResource Include="Resources\Phone\Collection\MesCenter\PropertyOn.png" /> + <BundleResource Include="Resources\Phone\FunctionIcon\AirFresh\HumiIcon.png" /> + <BundleResource Include="Resources\Phone\FunctionIcon\AirFresh\btnCloseIcon.png" /> + <BundleResource Include="Resources\Phone\FunctionIcon\AirFresh\btnInfoIcon.png" /> + <BundleResource Include="Resources\Phone\FunctionIcon\AirFresh\HumiOnIcon.png" /> </ItemGroup> <ItemGroup> <ITunesArtwork Include="iTunesArtwork" /> @@ -1351,6 +1401,11 @@ <Project>{2DDF4C3C-6998-432E-9F43-6786D82F0630}</Project> <Name>Blufi</Name> </ProjectReference> + <ProjectReference Include="..\SiriIntentUI\SiriIntentUI.csproj"> + <IsAppExtension>true</IsAppExtension> + <Project>{B594D3F5-4B93-4988-B45E-150BBFDC8A43}</Project> + <Name>SiriIntentUI</Name> + </ProjectReference> </ItemGroup> <Import Project="..\HDL_ON\HDL_ON.projitems" Label="Shared" Condition="Exists('..\HDL_ON\HDL_ON.projitems')" /> <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" /> -- Gitblit v1.8.0