From 774baeb1f5d2d49bfd692b79faa240bd7949dc17 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期四, 02 九月 2021 10:06:48 +0800
Subject: [PATCH] 2021-09-02 1.更新控件库，iOS裁剪支持指定大小或者不压缩。2.更新linphoneiOS和Android库，监视关闭麦克风。3.Android丰林和乐橙截图后增加广播推送系统相册刷新。
---
HDL-ON_Android/HDL-ON_Android.csproj | 43 ++++++++++++++++++++++++++++++++++++++++---
1 files changed, 40 insertions(+), 3 deletions(-)
diff --git a/HDL-ON_Android/HDL-ON_Android.csproj b/HDL-ON_Android/HDL-ON_Android.csproj
index f3aab45..4df5f13 100644
--- a/HDL-ON_Android/HDL-ON_Android.csproj
+++ b/HDL-ON_Android/HDL-ON_Android.csproj
@@ -51,7 +51,6 @@
<MandroidI18n>cjk</MandroidI18n>
<AndroidEnableSGenConcurrent>false</AndroidEnableSGenConcurrent>
<AndroidUseSharedRuntime>false</AndroidUseSharedRuntime>
- <AndroidSupportedAbis>armeabi-v7a;arm64-v8a</AndroidSupportedAbis>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
@@ -146,6 +145,9 @@
<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>
@@ -155,8 +157,8 @@
<Reference Include="ys">
<HintPath>..\DLL\EZvizMonitor\ys.dll</HintPath>
</Reference>
- <Reference Include="LC_SDK">
- <HintPath>..\DLL\LC\Android\LC_SDK.dll</HintPath>
+ <Reference Include="Shared.Droid.HDLLinphone">
+ <HintPath>..\DLL\Linphone\Android\Shared.Droid.HDLLinphone.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
@@ -178,6 +180,7 @@
<Compile Include="LeChengVideo\Form\MonitorFragment.cs" />
<Compile Include="LeChengVideo\Form\ReverseCallFragment.cs" />
<Compile Include="LeChengVideoActivity.cs" />
+ <Compile Include="Other\HDLONUtils.cs" />
</ItemGroup>
<ItemGroup>
<None Include="Resources\AboutResources.txt" />
@@ -428,6 +431,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" />
@@ -1326,6 +1360,9 @@
</ItemGroup>
<ItemGroup>
<Folder Include="Assets\Phone\FunctionIcon\IrFan\" />
+ <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