From 9463fa981945f278a639a1303192272732415f22 Mon Sep 17 00:00:00 2001
From: tzy <hxb@hdlchina.com.cn>
Date: 星期一, 29 三月 2021 09:20:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/temp-wxr' into dev-tzy
---
HDL-ON_Android/HDL-ON_Android.csproj | 109 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 109 insertions(+), 0 deletions(-)
diff --git a/HDL-ON_Android/HDL-ON_Android.csproj b/HDL-ON_Android/HDL-ON_Android.csproj
index 7d9cfd9..00f6003 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>..\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>
</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\" />
@@ -261,6 +364,12 @@
<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>
<AndroidAsset Include="Assets\Language.ini" />
--
Gitblit v1.8.0