From 30741caa02ed108fb0fbbaeda91eb6dd7c33fc9f Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 27 八月 2021 11:48:35 +0800
Subject: [PATCH] Merge branch 'CJL-Linphone' into wxr7
---
HDL-ON_iOS/HDL-ON_iOS.csproj | 39 +++++++++++++++++++++++++++++++++++++--
1 files changed, 37 insertions(+), 2 deletions(-)
diff --git a/HDL-ON_iOS/HDL-ON_iOS.csproj b/HDL-ON_iOS/HDL-ON_iOS.csproj
index 1c4bf79..0fc2a6b 100644
--- a/HDL-ON_iOS/HDL-ON_iOS.csproj
+++ b/HDL-ON_iOS/HDL-ON_iOS.csproj
@@ -101,8 +101,8 @@
<Reference Include="Shared.IOS.LCVideoOnSDK">
<HintPath>..\DLL\LC\IOS\Shared.IOS.LCVideoOnSDK.dll</HintPath>
</Reference>
- <Reference Include="Shared.Droid.HDLLinphone">
- <HintPath>..\..\Linphone\HDLLinphoneSDK_Android\Shared.Droid.HDLLinphone\Shared.Droid.HDLLinphone\bin\Release\Shared.Droid.HDLLinphone.dll</HintPath>
+ <Reference Include="Shared.IOS.HDLLinphoneSDK">
+ <HintPath>..\DLL\Linphone\iOS\Shared.IOS.HDLLinphoneSDK.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
@@ -129,6 +129,9 @@
</PackageReference>
<PackageReference Include="Xamarin.Essentials">
<Version>1.7.0</Version>
+ </PackageReference>
+ <PackageReference Include="Xamarin.Swift">
+ <Version>1.0.8</Version>
</PackageReference>
</ItemGroup>
<ItemGroup>
@@ -460,6 +463,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" />
@@ -1318,6 +1324,35 @@
<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" />
</ItemGroup>
<ItemGroup>
<ITunesArtwork Include="iTunesArtwork" />
--
Gitblit v1.8.0