From 16b65f9019f8df3b154ab835b92879ca618be1c3 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期三, 03 二月 2021 16:28:10 +0800
Subject: [PATCH] 2021-02-03 1.增加丰林可视对讲测试验证
---
HDL-ON_Android/HDL-ON_Android.csproj | 169 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 166 insertions(+), 3 deletions(-)
diff --git a/HDL-ON_Android/HDL-ON_Android.csproj b/HDL-ON_Android/HDL-ON_Android.csproj
index d53e103..5afb26e 100644
--- a/HDL-ON_Android/HDL-ON_Android.csproj
+++ b/HDL-ON_Android/HDL-ON_Android.csproj
@@ -125,9 +125,26 @@
<Reference Include="Shared.Droid.JLCountryCode">
<HintPath>..\DLL\Android\Shared.Droid.JLCountryCode.dll</HintPath>
</Reference>
+ <Reference Include="cloudp2p">
+ <HintPath>..\DLL\FL\cloudp2p.dll</HintPath>
+ </Reference>
+ <Reference Include="corelooper">
+ <HintPath>..\DLL\FL\corelooper.dll</HintPath>
+ </Reference>
+ <Reference Include="crypt">
+ <HintPath>..\DLL\FL\crypt.dll</HintPath>
+ </Reference>
+ <Reference Include="http">
+ <HintPath>..\DLL\FL\http.dll</HintPath>
+ </Reference>
+ <Reference Include="VideoLibs">
+ <HintPath>..\DLL\FL\VideoLibs.dll</HintPath>
+ </Reference>
+ <Reference Include="videophone">
+ <HintPath>..\DLL\FL\videophone.dll</HintPath>
+ </Reference>
</ItemGroup>
<ItemGroup>
- <Compile Include="MainActivity.cs" />
<Compile Include="Resources\Resource.designer.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Application.cs" />
@@ -137,6 +154,11 @@
<Compile Include="Other\JLCountrycode.cs" />
<Compile Include="Other\JPush\JPushReceiver.cs" />
<Compile Include="Other\JPush\JPushService.cs" />
+ <Compile Include="FengLinVideo\Interface\VideoState.cs" />
+ <Compile Include="FengLinVideo\Forms\MonitorFragment.cs" />
+ <Compile Include="FengLinVideo\Forms\ReverseCallFragment.cs" />
+ <Compile Include="FengLinVideo\widget\TipDiaglog.cs" />
+ <Compile Include="FengLinVideo\VideoActivity.cs" />
</ItemGroup>
<ItemGroup>
<None Include="Resources\AboutResources.txt" />
@@ -196,6 +218,90 @@
<SubType></SubType>
<Generator></Generator>
</AndroidResource>
+ <AndroidResource Include="Resources\drawable\hangup.png">
+ <SubType></SubType>
+ <Generator></Generator>
+ </AndroidResource>
+ <AndroidResource Include="Resources\drawable\video_background.xml">
+ <SubType></SubType>
+ <Generator></Generator>
+ </AndroidResource>
+ <AndroidResource Include="Resources\drawable\tip_background.xml">
+ <SubType></SubType>
+ <Generator></Generator>
+ </AndroidResource>
+ <AndroidResource Include="Resources\drawable\dialog_background.xml">
+ <SubType></SubType>
+ <Generator></Generator>
+ </AndroidResource>
+ <AndroidResource Include="Resources\drawable\sure_background_def.xml">
+ <SubType></SubType>
+ <Generator></Generator>
+ </AndroidResource>
+ <AndroidResource Include="Resources\drawable\screenshot.xml">
+ <SubType></SubType>
+ <Generator></Generator>
+ </AndroidResource>
+ <AndroidResource Include="Resources\drawable\sure_background_sel.xml">
+ <SubType></SubType>
+ <Generator></Generator>
+ </AndroidResource>
+ <AndroidResource Include="Resources\drawable\screenshot_def.png">
+ <SubType></SubType>
+ <Generator></Generator>
+ </AndroidResource>
+ <AndroidResource Include="Resources\drawable\floor.png">
+ <SubType></SubType>
+ <Generator></Generator>
+ </AndroidResource>
+ <AndroidResource Include="Resources\drawable\screenshot_sel.png">
+ <SubType></SubType>
+ <Generator></Generator>
+ </AndroidResource>
+ <AndroidResource Include="Resources\drawable\call.png">
+ <SubType></SubType>
+ <Generator></Generator>
+ </AndroidResource>
+ <AndroidResource Include="Resources\drawable\unlock.xml">
+ <SubType></SubType>
+ <Generator></Generator>
+ </AndroidResource>
+ <AndroidResource Include="Resources\drawable\unlock_def.png">
+ <SubType></SubType>
+ <Generator></Generator>
+ </AndroidResource>
+ <AndroidResource Include="Resources\drawable\unlock_disable.png">
+ <SubType></SubType>
+ <Generator></Generator>
+ </AndroidResource>
+ <AndroidResource Include="Resources\drawable\unlock_sel.png">
+ <SubType></SubType>
+ <Generator></Generator>
+ </AndroidResource>
+ <AndroidResource Include="Resources\drawable\back.png">
+ <SubType></SubType>
+ <Generator></Generator>
+ </AndroidResource>
+ <AndroidResource Include="Resources\layout\fragment_call.axml">
+ <SubType></SubType>
+ <Generator></Generator>
+ </AndroidResource>
+ <AndroidResource Include="Resources\layout\dialog_tip.xml">
+ <SubType></SubType>
+ <Generator></Generator>
+ </AndroidResource>
+ <AndroidResource Include="Resources\layout\activity_video_phone.xml">
+ <SubType></SubType>
+ <Generator></Generator>
+ </AndroidResource>
+ <AndroidResource Include="Resources\layout\fragment_monitor.xml">
+ <SubType></SubType>
+ <Generator></Generator>
+ </AndroidResource>
+ <AndroidResource Include="Resources\color\text_color.xml">
+ <SubType></SubType>
+ <Generator></Generator>
+ </AndroidResource>
</ItemGroup>
<ItemGroup>
<Folder Include="Resources\drawable\" />
@@ -209,7 +315,7 @@
<PackageReference Include="Xamarin.Android.Support.Design" Version="28.0.0.3" />
<PackageReference Include="Xamarin.Android.Support.Core.Utils" Version="28.0.0.3" />
<PackageReference Include="Xamarin.Android.Support.CustomTabs" Version="28.0.0.3" />
- <PackageReference Include="Xamarin.Essentials" Version="1.6.0" />
+ <PackageReference Include="Xamarin.Essentials" Version="1.6.1" />
<PackageReference Include="Xamarin.Android.Support.v4">
<Version>28.0.0.3</Version>
</PackageReference>
@@ -217,7 +323,7 @@
<Version>12.0.3</Version>
</PackageReference>
<PackageReference Include="MQTTnet">
- <Version>3.0.13</Version>
+ <Version>3.0.14</Version>
</PackageReference>
<PackageReference Include="ZXing.Net.Mobile">
<Version>2.4.1</Version>
@@ -230,6 +336,15 @@
</PackageReference>
<PackageReference Include="Bugly">
<Version>4.3.1</Version>
+ </PackageReference>
+ <PackageReference Include="Xamarin.Android.Support.Constraint.Layout">
+ <Version>1.1.2</Version>
+ </PackageReference>
+ <PackageReference Include="Xamarin.Android.Support.Constraint.Layout.Solver">
+ <Version>1.1.2</Version>
+ </PackageReference>
+ <PackageReference Include="Xamarin.Android.Support.Fragment">
+ <Version>28.0.0.3</Version>
</PackageReference>
</ItemGroup>
<ItemGroup>
@@ -679,6 +794,54 @@
<AndroidAsset Include="Assets\Phone\LogicIcon\location.png" />
<AndroidAsset Include="Assets\Phone\LogicIcon\changesinoutdoor.png" />
<AndroidAsset Include="Assets\Phone\PersonalCenter\UserTypebg2.png" />
+ <AndroidAsset Include="Assets\Phone\LogicIcon\sensor.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\AirCleanerThiinIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\WeepRobotThinIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\WeepRobot\MuteSelect.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\WeepRobot\Battery.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\WeepRobot\ControlRight.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\WeepRobot\AreaMode.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\WeepRobot\AutoMode.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\WeepRobot\FixedPointModeSelect.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\WeepRobot\Charge.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\WeepRobot\CleanSelect.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\WeepRobot\ControlUp.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\WeepRobot\SuctionSelect.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\WeepRobot\WallMode.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\WeepRobot\FixedPointMode.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\WeepRobot\ControlLeft.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\WeepRobot\AreaModeSelect.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\WeepRobot\ControlDisable.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\WeepRobot\ChargeSelect.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\WeepRobot\Suction.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\WeepRobot\Clean.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\WeepRobot\AutoModeSelect.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\WeepRobot\ControlDown.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\WeepRobot\VoiceSelect.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\WeepRobot\Mute.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\WeepRobot\WallModeSelect.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\WeepRobot\Voice.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\WeepRobot\ControlEnable.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\Fan\SleepModeSelect.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\Fan\Fan.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\Fan\LowGear.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\Fan\HandModeSelect.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\Fan\Time.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\Fan\MidGearSelect.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\Fan\AutoMode.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\Fan\AirCleanerOff.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\Fan\HandMode.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\Fan\HeightGearSelect.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\Fan\ComfortableMode.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\Fan\MidGear.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\Fan\SleepMode.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\Fan\AirCleanerOn.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\Fan\LowGearSelect.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\Fan\AutoModeSelect.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\Fan\DialogTitleMenuGroud3.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\Fan\HeightGear.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\Fan\ComfortableModeSelect.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\Fan\DialogTitleMenuGroud4.png" />
</ItemGroup>
<ItemGroup>
<AndroidNativeLibrary Include="libs\armeabi-v7a\libelianjni.so" />
--
Gitblit v1.8.0