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 | 173 ++++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 158 insertions(+), 15 deletions(-)
diff --git a/HDL-ON_iOS/HDL-ON_iOS.csproj b/HDL-ON_iOS/HDL-ON_iOS.csproj
index 733557b..5704978 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-20210616-1</CodesignProvision>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhoneSimulator' ">
<DebugType>none</DebugType>
@@ -34,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>
@@ -53,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>ComHdlOnProDevelopment20210305-1</CodesignProvision>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhone' ">
<DebugType>none</DebugType>
@@ -68,7 +69,7 @@
<MtouchLink>SdkOnly</MtouchLink>
<MtouchExtraArgs>-gcc_flags="-dead_strip -ObjC"</MtouchExtraArgs>
<MtouchI18n>cjk</MtouchI18n>
- <CodesignProvision>On+_Hoc20210401-1</CodesignProvision>
+ <CodesignProvision>OnPro-Hoc20211117-1</CodesignProvision>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
@@ -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>
@@ -95,34 +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.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\" />
@@ -450,6 +458,11 @@
<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\" />
+ <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" />
@@ -647,7 +660,6 @@
<BundleResource Include="Resources\Phone\FunctionIcon\Electrical\TV\PlusIcon.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\Electrical\TV\ReduceIcon.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\Electrical\TVThinIcon.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\TVIcon.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\EnvironmentalScience\SmogIcon.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\EnvironmentalScience\LocationIcon.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\EnvironmentalScience\UpArrow.png" />
@@ -934,7 +946,6 @@
<BundleResource Include="Resources\Phone\FunctionIcon\Electrical\Fan\ComfortableModeSelect.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\Electrical\Fan\DialogTitleMenuGroud4.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\Electrical\WeepRobot\MuteSelect.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\WeepRobot\Battery.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\Electrical\WeepRobot\ControlRight.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\Electrical\WeepRobot\AreaMode.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\Electrical\WeepRobot\AutoMode.png" />
@@ -1219,6 +1230,133 @@
<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" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\Redistribution.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\DoorLock.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\LockPictrue2.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\UnLockManager.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\LockPictrue1.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\NormallyOpenIcon2.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\CrearPswBackgroud.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\NormallyOpenIcon3.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\Editor.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\NormallyOpenIcon1.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\Connect.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\History.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\Screen.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\BindScene.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\Shard.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\Delete.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\UnConnect.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\More.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\Mute.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\Voice.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\UnLockPictrue1.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\Hide.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\UnLockPictrue2.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\UnLockPictrue3.png" />
+ <BundleResource Include="Resources\Phone\Public\BatteryEnough.png" />
+ <BundleResource Include="Resources\Phone\Public\BatteryNot.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\irpjt_blue.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\irpjt_white.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\irstb_blue.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\irstb_white.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\irpjt.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\irstb.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Energy\EnergyDrodUpIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\sensormegahealth.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\TV\TVOkIconDown.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\TV\TVOkIconLeft.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\TV\TVOkIconRight.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\TV\TVOkIconUp.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\TV\TVOkIconOk.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\irtvxm.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\irtvxm_blue.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\irtvxm_white.png" />
+ <BundleResource Include="Resources\Phone\PersonalCenter\AddDevice\SenesorMegahealthBg.png" />
+ <BundleResource Include="Resources\Phone\Public\Scan.png" />
+ <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" />
+ <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" />
@@ -1263,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