From 80faceb86399017851f9f72feaaef868a37ff23f Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 26 三月 2021 10:50:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/lss' into temp-wxr
---
HDL-ON_Android/HDL-ON_Android.csproj | 151 ++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 151 insertions(+), 0 deletions(-)
diff --git a/HDL-ON_Android/HDL-ON_Android.csproj b/HDL-ON_Android/HDL-ON_Android.csproj
index c8c0871..9c7d6cb 100644
--- a/HDL-ON_Android/HDL-ON_Android.csproj
+++ b/HDL-ON_Android/HDL-ON_Android.csproj
@@ -128,6 +128,24 @@
<Reference Include="AndriodBluetoothLibrary">
<HintPath>..\DLL\Android\AndriodBluetoothLibrary.dll</HintPath>
</Reference>
+ <Reference Include="cloudp2p">
+ <HintPath>..\..\..\鏈懡鍚嶆枃浠跺す\cloudp2p.dll</HintPath>
+ </Reference>
+ <Reference Include="corelooper">
+ <HintPath>..\..\..\鏈懡鍚嶆枃浠跺す\corelooper.dll</HintPath>
+ </Reference>
+ <Reference Include="crypt">
+ <HintPath>..\..\..\鏈懡鍚嶆枃浠跺す\crypt.dll</HintPath>
+ </Reference>
+ <Reference Include="http">
+ <HintPath>..\..\..\鏈懡鍚嶆枃浠跺す\http.dll</HintPath>
+ </Reference>
+ <Reference Include="VideoLibs">
+ <HintPath>..\..\..\鏈懡鍚嶆枃浠跺す\VideoLibs.dll</HintPath>
+ </Reference>
+ <Reference Include="videophone">
+ <HintPath>..\..\..\鏈懡鍚嶆枃浠跺す\videophone.dll</HintPath>
+ </Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="MainActivity.cs" />
@@ -140,6 +158,11 @@
<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" />
</ItemGroup>
<ItemGroup>
<None Include="Resources\AboutResources.txt" />
@@ -221,6 +244,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\" />
@@ -232,6 +335,7 @@
<Folder Include="Assets\Phone\FunctionIcon\Electrical\WaterValve\" />
<Folder Include="Assets\Phone\FunctionIcon\Electrical\ClothesHanger\" />
<Folder Include="Assets\Phone\PirIcon\" />
+ <Folder Include="Assets\Phone\VideoIcon\" />
</ItemGroup>
<ItemGroup />
<ItemGroup>
@@ -259,6 +363,12 @@
</PackageReference>
<PackageReference Include="Bugly">
<Version>4.3.1</Version>
+ </PackageReference>
+ <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>
</ItemGroup>
<ItemGroup>
@@ -925,6 +1035,47 @@
<AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\irlearn_white.png" />
<AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\curtainswitch_white.png" />
<AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\electricalracks_white.png" />
+ <AndroidAsset Include="Assets\Phone\VideoIcon\answer.png" />
+ <AndroidAsset Include="Assets\Phone\VideoIcon\danyuanji.png" />
+ <AndroidAsset Include="Assets\Phone\VideoIcon\hangup.png" />
+ <AndroidAsset Include="Assets\Phone\VideoIcon\keshiduijiang.png" />
+ <AndroidAsset Include="Assets\Phone\VideoIcon\menjin.png" />
+ <AndroidAsset Include="Assets\Phone\VideoIcon\phone.png" />
+ <AndroidAsset Include="Assets\Phone\VideoIcon\weiqiangji.png" />
+ <AndroidAsset Include="Assets\Phone\PirIcon\1.png" />
+ <AndroidAsset Include="Assets\Phone\PirIcon\2.png" />
+ <AndroidAsset Include="Assets\Phone\PirIcon\3.png" />
+ <AndroidAsset Include="Assets\Phone\PirIcon\4.png" />
+ <AndroidAsset Include="Assets\Phone\PirIcon\left.png" />
+ <AndroidAsset Include="Assets\Phone\PirIcon\right.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\TV\TVAV.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\EnvirSensor\TvocIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\EnvirSensor\TempIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\EnvirSensor\Pm25Icon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\EnvirSensor\29.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\EnvirSensor\HumidityIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\EnvirSensor\13.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\EnvirSensor\TvocBg.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\EnvirSensor\20.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\EnvirSensor\Co2Icon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\EnvirSensor\LowerLimit.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\EnvirSensor\18.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\EnvirSensor\InfoIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\EnvirSensor\4.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\EnvirSensor\Co2Bg.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\EnvirSensor\HumidityBg.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\EnvirSensor\5.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\EnvirSensor\UpperLimit.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\EnvirSensor\TempBg.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\EnvirSensor\6.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\EnvirSensor\2.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\EnvirSensor\3.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\EnvirSensor\45.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\EnvirSensor\1.png" />
+ <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" />
</ItemGroup>
<ItemGroup>
<AndroidNativeLibrary Include="libs\armeabi-v7a\libelianjni.so" />
--
Gitblit v1.8.0