From 0af30aadd6e0b6549bdcc6c2b2c82b8d12294b85 Mon Sep 17 00:00:00 2001 From: JLChen <551775569@qq.com> Date: 星期三, 10 十一月 2021 17:26:23 +0800 Subject: [PATCH] 2021-11-10 1.Android没适配乐橙国内环境问题修复。 --- HDL-ON_iOS/HDL-ON_iOS.csproj | 46 +++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 41 insertions(+), 5 deletions(-) diff --git a/HDL-ON_iOS/HDL-ON_iOS.csproj b/HDL-ON_iOS/HDL-ON_iOS.csproj index 1c613f2..af40167 100644 --- a/HDL-ON_iOS/HDL-ON_iOS.csproj +++ b/HDL-ON_iOS/HDL-ON_iOS.csproj @@ -54,7 +54,7 @@ <MtouchLink>SdkOnly</MtouchLink> <MtouchExtraArgs>-gcc_flags="-dead_strip -ObjC"</MtouchExtraArgs> <MtouchEnableSGenConc>false</MtouchEnableSGenConc> -<CodesignProvision>On+Dev-20210616-1</CodesignProvision> +<CodesignProvision>On+Dev-20210913-1</CodesignProvision> <CodesignEntitlements>Entitlements.plist</CodesignEntitlements> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhone' "> @@ -69,7 +69,7 @@ <MtouchLink>SdkOnly</MtouchLink> <MtouchExtraArgs>-gcc_flags="-dead_strip -ObjC"</MtouchExtraArgs> <MtouchI18n>cjk</MtouchI18n> - <CodesignProvision>ComHdlOnProAdHoc20210616-1</CodesignProvision> + <CodesignProvision>ComHdlOnProAdHoc20210914-1</CodesignProvision> </PropertyGroup> <ItemGroup> <Reference Include="System" /> @@ -129,9 +129,6 @@ </PackageReference> <PackageReference Include="Xamarin.Essentials"> <Version>1.7.0</Version> - </PackageReference> - <PackageReference Include="Xamarin.Swift"> - <Version>1.0.8</Version> </PackageReference> </ItemGroup> <ItemGroup> @@ -463,6 +460,9 @@ <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" /> @@ -1321,6 +1321,42 @@ <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" /> -- Gitblit v1.8.0