From d72ca686a3e262693f8a6e45e747e8e8da43335b Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期二, 06 七月 2021 09:39:03 +0800
Subject: [PATCH] 2021-07-06 1.更新
---
HDL-ON_Android/HDL-ON_Android.csproj | 175 +++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 165 insertions(+), 10 deletions(-)
diff --git a/HDL-ON_Android/HDL-ON_Android.csproj b/HDL-ON_Android/HDL-ON_Android.csproj
index 8b7cf06..3dcf404 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>
@@ -128,6 +127,36 @@
<Reference Include="AndriodBluetoothLibrary">
<HintPath>..\DLL\Android\AndriodBluetoothLibrary.dll</HintPath>
</Reference>
+ <Reference Include="cloudp2p">
+ <HintPath>..\DLL\FL\Android\cloudp2p.dll</HintPath>
+ </Reference>
+ <Reference Include="corelooper">
+ <HintPath>..\DLL\FL\Android\corelooper.dll</HintPath>
+ </Reference>
+ <Reference Include="crypt">
+ <HintPath>..\DLL\FL\Android\crypt.dll</HintPath>
+ </Reference>
+ <Reference Include="http">
+ <HintPath>..\DLL\FL\Android\http.dll</HintPath>
+ </Reference>
+ <Reference Include="VideoLibs">
+ <HintPath>..\DLL\FL\Android\VideoLibs.dll</HintPath>
+ </Reference>
+ <Reference Include="videophone">
+ <HintPath>..\DLL\FL\Android\videophone.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="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" />
@@ -140,6 +169,14 @@
<Compile Include="Other\JLCountrycode.cs" />
<Compile Include="Other\JPush\JPushReceiver.cs" />
<Compile Include="Other\JPush\JPushService.cs" />
+ <Compile Include="VideoActivity.cs" />
+ <Compile Include="FengLinVideo\Interface\VideoState.cs" />
+ <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" />
@@ -221,6 +258,86 @@
<Generator>
</Generator>
</AndroidResource>
+ <AndroidResource Include="Resources\drawable\answer.png">
+ <SubType></SubType>
+ <Generator></Generator>
+ </AndroidResource>
+ <AndroidResource Include="Resources\drawable\back_icon.png">
+ <SubType></SubType>
+ <Generator></Generator>
+ </AndroidResource>
+ <AndroidResource Include="Resources\drawable\dialog_background.xml">
+ <SubType></SubType>
+ <Generator></Generator>
+ </AndroidResource>
+ <AndroidResource Include="Resources\drawable\hangup.png">
+ <SubType></SubType>
+ <Generator></Generator>
+ </AndroidResource>
+ <AndroidResource Include="Resources\drawable\mic.png">
+ <SubType></SubType>
+ <Generator></Generator>
+ </AndroidResource>
+ <AndroidResource Include="Resources\drawable\screenshot_def.png">
+ <SubType></SubType>
+ <Generator></Generator>
+ </AndroidResource>
+ <AndroidResource Include="Resources\drawable\screenshot_sel.png">
+ <SubType></SubType>
+ <Generator></Generator>
+ </AndroidResource>
+ <AndroidResource Include="Resources\drawable\screenshot.xml">
+ <SubType></SubType>
+ <Generator></Generator>
+ </AndroidResource>
+ <AndroidResource Include="Resources\drawable\sure_background_def.xml">
+ <SubType></SubType>
+ <Generator></Generator>
+ </AndroidResource>
+ <AndroidResource Include="Resources\drawable\sure_background_sel.xml">
+ <SubType></SubType>
+ <Generator></Generator>
+ </AndroidResource>
+ <AndroidResource Include="Resources\drawable\tip_background.xml">
+ <SubType></SubType>
+ <Generator></Generator>
+ </AndroidResource>
+ <AndroidResource Include="Resources\drawable\unlock_def.png">
+ <SubType></SubType>
+ <Generator></Generator>
+ </AndroidResource>
+ <AndroidResource Include="Resources\drawable\unlock_sel.png">
+ <SubType></SubType>
+ <Generator></Generator>
+ </AndroidResource>
+ <AndroidResource Include="Resources\drawable\unlock.xml">
+ <SubType></SubType>
+ <Generator></Generator>
+ </AndroidResource>
+ <AndroidResource Include="Resources\drawable\video_background.png">
+ <SubType></SubType>
+ <Generator></Generator>
+ </AndroidResource>
+ <AndroidResource Include="Resources\layout\activity_video_phone.xml">
+ <SubType></SubType>
+ <Generator></Generator>
+ </AndroidResource>
+ <AndroidResource Include="Resources\layout\dialog_tip.xml">
+ <SubType></SubType>
+ <Generator></Generator>
+ </AndroidResource>
+ <AndroidResource Include="Resources\layout\fragment_call.xml">
+ <SubType></SubType>
+ <Generator></Generator>
+ </AndroidResource>
+ <AndroidResource Include="Resources\layout\fragment_monitor.xml">
+ <SubType></SubType>
+ <Generator></Generator>
+ </AndroidResource>
+ <AndroidResource Include="Resources\values-zh\strings.xml">
+ <SubType></SubType>
+ <Generator></Generator>
+ </AndroidResource>
</ItemGroup>
<ItemGroup>
<Folder Include="Resources\drawable\" />
@@ -233,6 +350,7 @@
<Folder Include="Assets\Phone\FunctionIcon\Electrical\ClothesHanger\" />
<Folder Include="Assets\Phone\PirIcon\" />
<Folder Include="Assets\Phone\VideoIcon\" />
+ <Folder Include="Assets\Phone\FunctionIcon\Energy\" />
</ItemGroup>
<ItemGroup />
<ItemGroup>
@@ -258,8 +376,20 @@
<PackageReference Include="XamarinLibrary.Xamarin.Android.Manual.JPush">
<Version>3.7.0</Version>
</PackageReference>
- <PackageReference Include="Bugly">
- <Version>4.3.1</Version>
+ <PackageReference Include="Xamarin.Android.Support.Constraint.Layout">
+ <Version>1.1.0</Version>
+ </PackageReference>
+ <PackageReference Include="Xamarin.Android.Support.Constraint.Layout.Solver">
+ <Version>1.1.0</Version>
+ </PackageReference>
+ <PackageReference Include="Microsoft.AppCenter">
+ <Version>4.2.0</Version>
+ </PackageReference>
+ <PackageReference Include="Microsoft.AppCenter.Crashes">
+ <Version>4.2.0</Version>
+ </PackageReference>
+ <PackageReference Include="Microsoft.AppCenter.Analytics">
+ <Version>4.2.0</Version>
</PackageReference>
</ItemGroup>
<ItemGroup>
@@ -966,16 +1096,41 @@
<AndroidAsset Include="Assets\Phone\FunctionIcon\EnvirSensor\Pm25Bg.png" />
<AndroidAsset Include="Assets\Phone\FunctionIcon\EnvirSensor\0.png" />
<AndroidAsset Include="Assets\Phone\PirIcon\add.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\AC\More.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Energy\EnergyDrodDownIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\AirFresh\VentilateSelect.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\AirFresh\EnergySelect.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\AirFresh\Fan2Select.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\AirFresh\Fan3.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\AirFresh\Energy.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\AirFresh\Fan2.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\AirFresh\ComfortableSelect.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\AirFresh\Fan1.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\AirFresh\Fan3Select.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\AirFresh\TempAndHumiBack.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\AirFresh\Comfortable.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\AirFresh\Humidification.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\AirFresh\HumidificationSelect.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\AirFresh\Ventilate.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\AirFresh\Fan1Select.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\Fan\DialogTitleMenuGroud2.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\airFreshjinmao.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\airFreshjinmao_blue.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\airFreshjinmao_white.png" />
+ <AndroidAsset Include="Assets\Phone\Public\RightSlideBackIcon.png" />
</ItemGroup>
<ItemGroup>
<AndroidNativeLibrary Include="libs\armeabi-v7a\libelianjni.so" />
<AndroidNativeLibrary Include="libs\armeabi-v7a\libjcore127.so" />
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="..\ys\ys.csproj">
- <Project>{DF065E3F-C3A1-4908-9582-000974B7C290}</Project>
- <Name>ys</Name>
- </ProjectReference>
+ <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>
<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