From 43b0d5870d528f23ecd6aeceb6cfd4325188b46f Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 01 七月 2021 15:50:43 +0800
Subject: [PATCH] Revert "1"
---
HDL-ON_Android/HDL-ON_Android.csproj | 86 +++++++++++++++++++++++++++++++++++++++++-
1 files changed, 83 insertions(+), 3 deletions(-)
diff --git a/HDL-ON_Android/HDL-ON_Android.csproj b/HDL-ON_Android/HDL-ON_Android.csproj
index f89849c..f3aab45 100644
--- a/HDL-ON_Android/HDL-ON_Android.csproj
+++ b/HDL-ON_Android/HDL-ON_Android.csproj
@@ -33,11 +33,10 @@
<DefineConstants>DEBUG;TRACE;__Android__</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
- <EmbedAssembliesIntoApk>False</EmbedAssembliesIntoApk>
+ <EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk>
<MandroidI18n>cjk</MandroidI18n>
<AndroidDexTool>d8</AndroidDexTool>
<AndroidEnableSGenConcurrent>false</AndroidEnableSGenConcurrent>
- <AndroidLinkMode>None</AndroidLinkMode>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugSymbols>True</DebugSymbols>
@@ -52,6 +51,7 @@
<MandroidI18n>cjk</MandroidI18n>
<AndroidEnableSGenConcurrent>false</AndroidEnableSGenConcurrent>
<AndroidUseSharedRuntime>false</AndroidUseSharedRuntime>
+ <AndroidSupportedAbis>armeabi-v7a;arm64-v8a</AndroidSupportedAbis>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
@@ -155,6 +155,9 @@
<Reference Include="ys">
<HintPath>..\DLL\EZvizMonitor\ys.dll</HintPath>
</Reference>
+ <Reference Include="LC_SDK">
+ <HintPath>..\DLL\LC\Android\LC_SDK.dll</HintPath>
+ </Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="MainActivity.cs" />
@@ -172,6 +175,9 @@
<Compile Include="FengLinVideo\Form\MonitorFragment.cs" />
<Compile Include="FengLinVideo\Form\ReverseCallFragment.cs" />
<Compile Include="FengLinVideo\widget\TipDiaglog.cs" />
+ <Compile Include="LeChengVideo\Form\MonitorFragment.cs" />
+ <Compile Include="LeChengVideo\Form\ReverseCallFragment.cs" />
+ <Compile Include="LeChengVideoActivity.cs" />
</ItemGroup>
<ItemGroup>
<None Include="Resources\AboutResources.txt" />
@@ -377,9 +383,51 @@
<SubType></SubType>
<Generator></Generator>
</AndroidResource>
+ <AndroidResource Include="Resources\mipmap-xhdpi\Loading.png">
+ <SubType></SubType>
+ <Generator></Generator>
+ </AndroidResource>
+ <AndroidResource Include="Resources\mipmap-hdpi\Loading.png">
+ <SubType></SubType>
+ <Generator></Generator>
+ </AndroidResource>
+ <AndroidResource Include="Resources\mipmap-mdpi\Loading.png">
+ <SubType></SubType>
+ <Generator></Generator>
+ </AndroidResource>
+ <AndroidResource Include="Resources\mipmap-xxhdpi\Loading.png">
+ <SubType></SubType>
+ <Generator></Generator>
+ </AndroidResource>
+ <AndroidResource Include="Resources\mipmap-xxxhdpi\Loading.png">
+ <SubType></SubType>
+ <Generator></Generator>
+ </AndroidResource>
</ItemGroup>
<ItemGroup>
<AndroidAsset Include="Assets\Phone\Public\MsgIcon\TipSuccessIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\AC\SweepIconLR.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\AC\SweepIconLROn.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\AC\SweepIconNull.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\AC\SweepIconNullOn.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\AC\SweepIconUD.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\AC\SweepIconUDOn.png" />
+ <AndroidAsset Include="Assets\Phone\Public\ScanGrey.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\IrFan\FanIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\IrFan\HeadSwingingIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\IrFan\HeadSwingingIconOn.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\IrFan\PatternIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\IrFan\PatternIconOn.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\IrFan\PowerIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\IrFan\PowerIconOn.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\IrFan\TimingIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\IrFan\TimingIconOn.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\IrFan\SpeedIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\IrFan\SpeedIconOn.png" />
+ <AndroidAsset Include="Assets\Phone\Classification\Room\AllCloseIcon2.png" />
+ <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" />
</ItemGroup>
<ItemGroup>
<AndroidAsset Include="Assets\Phone\FunctionIcon\DoorLock\BindScene.png" />
@@ -565,7 +613,6 @@
<AndroidAsset Include="Assets\Phone\FunctionIcon\Music\MusicIcon.png" />
<AndroidAsset Include="Assets\Phone\FunctionIcon\Music\MusicOnIcon.png" />
<AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\FanIconBg.png" />
- <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\TVIcon.png" />
<AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\FanThinIcon.png" />
<AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\FanIcon.png" />
<AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\FanIconOnBg.png" />
@@ -1167,10 +1214,40 @@
<AndroidAsset Include="Assets\Phone\FunctionIcon\Curtain\CurtainUpIcon.png" />
<AndroidAsset Include="Assets\Phone\FunctionIcon\Curtain\CurtainUpIconOn.png" />
<AndroidAsset Include="Assets\Phone\PersonalCenter\SmartSpeaker.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\irpjt.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\irstb.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\irpjt_blue.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\irpjt_white.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\irstb_blue.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\irstb_white.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Energy\EnergyDrodUpIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\sensormegahealth.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\TV\TVOkIconDown.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\TV\TVOkIconLeft.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\TV\TVOkIconRight.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\TV\TVOkIconUp.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\TV\TVOkIconOk.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\irtvxm.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\irtvxm_blue.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\irtvxm_white.png" />
+ <AndroidAsset Include="Assets\Phone\PersonalCenter\AddDevice\SenesorMegahealthBg.png" />
+ <AndroidAsset Include="Assets\Phone\Public\Scan.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\ArmSensor\SomeoneFellBgIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\ArmSensor\SomeoneInBgIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\ArmSensor\UnderProtectionBgIcon.png" />
</ItemGroup>
<ItemGroup>
<AndroidNativeLibrary Include="libs\armeabi-v7a\libelianjni.so" />
<AndroidNativeLibrary Include="libs\armeabi-v7a\libjcore127.so" />
+ <AndroidNativeLibrary Include="libs\armeabi-v7a\libconfigsdk.so" />
+ <AndroidNativeLibrary Include="libs\armeabi-v7a\libGMCrypto.so" />
+ <AndroidNativeLibrary Include="libs\armeabi-v7a\libgnustl_shared.so" />
+ <AndroidNativeLibrary Include="libs\armeabi-v7a\libjninetsdk.so" />
+ <AndroidNativeLibrary Include="libs\armeabi-v7a\libLCOpenApiClient.so" />
+ <AndroidNativeLibrary Include="libs\armeabi-v7a\libLechangeSDK.so" />
+ <AndroidNativeLibrary Include="libs\armeabi-v7a\libnetsdk.so" />
+ <AndroidNativeLibrary Include="libs\armeabi-v7a\libSmartConfig.so" />
+ <AndroidNativeLibrary Include="libs\armeabi-v7a\libSoftAPConfig.so" />
</ItemGroup>
<ItemGroup>
<AndroidAsset Include="Assets\Phone\FunctionIcon\DoorLock\Connect.png" />
@@ -1247,6 +1324,9 @@
<ItemGroup>
<AndroidAsset Include="Assets\Phone\FunctionIcon\DoorLock\DoorLock.png" />
</ItemGroup>
+ <ItemGroup>
+ <Folder Include="Assets\Phone\FunctionIcon\IrFan\" />
+ </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" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
--
Gitblit v1.8.0