From eda3fb873e59544ff36301b51e05aef64f87b0f9 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 27 八月 2021 13:21:21 +0800
Subject: [PATCH] Merge branch 'newBranch1' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project into newBranch1
---
HDL-ON_Android/HDL-ON_Android.csproj | 49 ++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 40 insertions(+), 9 deletions(-)
diff --git a/HDL-ON_Android/HDL-ON_Android.csproj b/HDL-ON_Android/HDL-ON_Android.csproj
index 0ee0e6b..f952702 100644
--- a/HDL-ON_Android/HDL-ON_Android.csproj
+++ b/HDL-ON_Android/HDL-ON_Android.csproj
@@ -145,17 +145,20 @@
<Reference Include="videophone">
<HintPath>..\DLL\FL\Android\videophone.dll</HintPath>
</Reference>
+ <Reference Include="LC_SDK">
+ <HintPath>..\DLL\LC\Android\LC_SDK.dll</HintPath>
+ </Reference>
<Reference Include="Square.OkHttp3">
<HintPath>..\DLL\EZvizMonitor\Square.OkHttp3.dll</HintPath>
</Reference>
<Reference Include="Square.OkIO">
<HintPath>..\DLL\EZvizMonitor\Square.OkIO.dll</HintPath>
</Reference>
- <Reference Include="LC_SDK">
- <HintPath>..\DLL\LC\Android\LC_SDK.dll</HintPath>
- </Reference>
<Reference Include="ys">
<HintPath>..\DLL\EZvizMonitor\ys.dll</HintPath>
+ </Reference>
+ <Reference Include="Shared.Droid.HDLLinphone">
+ <HintPath>..\DLL\Linphone\Android\Shared.Droid.HDLLinphone.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
@@ -427,6 +430,37 @@
<AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\irfan_blue.png" />
<AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\irfan_white.png" />
<AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\irfan.png" />
+ <AndroidAsset Include="Assets\Phone\PersonalCenter\AddDevice\EnvironmentalSensorbg.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\sensorenvironment.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\AirFresh\AirFreshBgIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\sensorenvironment2.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\sensorenvironment3.png" />
+ <AndroidAsset Include="Assets\Phone\PersonalCenter\AddDevice\EnvirSensorQingpingCGS1bg.png" />
+ <AndroidAsset Include="Assets\Phone\PersonalCenter\AddDevice\EnvirSensorQingpingLitebg.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\ArmCenter\AddTargetIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\ArmCenter\RightIcon.png" />
+ <AndroidAsset Include="Assets\Phone\PersonalCenter\FacePassage\FaceIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Light\LightScene\CheckIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Light\LightScene\CheckOnIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Light\LightScene\SetLightSceneIcon.png" />
+ <AndroidAsset Include="Assets\Phone\Collection\DefenseStatusIcon.png" />
+ <AndroidAsset Include="Assets\Phone\Collection\DisarmStatusIcon.png" />
+ <AndroidAsset Include="Assets\Phone\PersonalCenter\ResidenceDefenseIcon.png" />
+ <AndroidAsset Include="Assets\Phone\Collection\DefenseAlarmIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\ArmCenter\InAlarmBigIcon.png" />
+ <AndroidAsset Include="Assets\Phone\PersonalCenter\ResidenceInAlarmIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\electricalbreaker.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\AirSwitch\AirSwitchBgIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\AirSwitch\AirSwitchBgOnIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\AirSwitch\EnergyIcon.png" />
+ <AndroidAsset Include="Assets\Phone\PersonalCenter\FacePassage\FailIcon.png" />
+ <AndroidAsset Include="Assets\Phone\PersonalCenter\FacePassage\TrueIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\sensorhcho.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\EnvirSensor\HchoBg.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\EnvirSensor\HchoIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\electricalbreaker_blue.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\electricalbreaker_white.png" />
+ <AndroidAsset Include="Assets\Phone\LogicIcon\security.png" />
</ItemGroup>
<ItemGroup>
<AndroidAsset Include="Assets\Phone\FunctionIcon\DoorLock\BindScene.png" />
@@ -1325,12 +1359,9 @@
</ItemGroup>
<ItemGroup>
<Folder Include="Assets\Phone\FunctionIcon\IrFan\" />
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="..\ys\ys.csproj">
- <Project>{DF065E3F-C3A1-4908-9582-000974B7C290}</Project>
- <Name>ys</Name>
- </ProjectReference>
+ <Folder Include="Assets\Phone\PersonalCenter\FacePassage\" />
+ <Folder Include="Assets\Phone\FunctionIcon\Light\LightScene\" />
+ <Folder Include="Assets\Phone\FunctionIcon\Electrical\AirSwitch\" />
</ItemGroup>
<Import Project="..\HDL_ON\HDL_ON.projitems" Label="Shared" Condition="Exists('..\HDL_ON\HDL_ON.projitems')" />
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
--
Gitblit v1.8.0