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 | 64 ++++++++++++++++++++++++++++----
1 files changed, 56 insertions(+), 8 deletions(-)
diff --git a/HDL-ON_iOS/HDL-ON_iOS.csproj b/HDL-ON_iOS/HDL-ON_iOS.csproj
index d26dc65..af40167 100644
--- a/HDL-ON_iOS/HDL-ON_iOS.csproj
+++ b/HDL-ON_iOS/HDL-ON_iOS.csproj
@@ -54,7 +54,8 @@
<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' ">
<DebugType>none</DebugType>
@@ -68,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" />
@@ -100,31 +101,34 @@
<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>
@@ -422,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\" />
@@ -453,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" />
@@ -1309,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" />
--
Gitblit v1.8.0