集成TRTC_SDK_8.1.0.9719
This commit is contained in:
parent
ac91cf996f
commit
eb341a7c05
|
@ -3,18 +3,30 @@ Microsoft Visual Studio Solution File, Format Version 12.00
|
||||||
# Visual Studio Version 16
|
# Visual Studio Version 16
|
||||||
VisualStudioVersion = 16.0.30717.126
|
VisualStudioVersion = 16.0.30717.126
|
||||||
MinimumVisualStudioVersion = 10.0.40219.1
|
MinimumVisualStudioVersion = 10.0.40219.1
|
||||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JianGongYun", "JianGongYun\JianGongYun.csproj", "{0B346099-B101-4426-800A-6FB1D4308F34}"
|
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JianGongYun", "JianGongYun\JianGongYun.csproj", "{0B346099-B101-4426-800A-6FB1D4308F34}"
|
||||||
EndProject
|
EndProject
|
||||||
Global
|
Global
|
||||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||||
Debug|Any CPU = Debug|Any CPU
|
Debug|Any CPU = Debug|Any CPU
|
||||||
|
Debug|x64 = Debug|x64
|
||||||
|
Debug|x86 = Debug|x86
|
||||||
Release|Any CPU = Release|Any CPU
|
Release|Any CPU = Release|Any CPU
|
||||||
|
Release|x64 = Release|x64
|
||||||
|
Release|x86 = Release|x86
|
||||||
EndGlobalSection
|
EndGlobalSection
|
||||||
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
||||||
{0B346099-B101-4426-800A-6FB1D4308F34}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
{0B346099-B101-4426-800A-6FB1D4308F34}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
{0B346099-B101-4426-800A-6FB1D4308F34}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
{0B346099-B101-4426-800A-6FB1D4308F34}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
|
{0B346099-B101-4426-800A-6FB1D4308F34}.Debug|x64.ActiveCfg = Debug|x64
|
||||||
|
{0B346099-B101-4426-800A-6FB1D4308F34}.Debug|x64.Build.0 = Debug|x64
|
||||||
|
{0B346099-B101-4426-800A-6FB1D4308F34}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||||
|
{0B346099-B101-4426-800A-6FB1D4308F34}.Debug|x86.Build.0 = Debug|Any CPU
|
||||||
{0B346099-B101-4426-800A-6FB1D4308F34}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
{0B346099-B101-4426-800A-6FB1D4308F34}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
{0B346099-B101-4426-800A-6FB1D4308F34}.Release|Any CPU.Build.0 = Release|Any CPU
|
{0B346099-B101-4426-800A-6FB1D4308F34}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
|
{0B346099-B101-4426-800A-6FB1D4308F34}.Release|x64.ActiveCfg = Release|x64
|
||||||
|
{0B346099-B101-4426-800A-6FB1D4308F34}.Release|x64.Build.0 = Release|x64
|
||||||
|
{0B346099-B101-4426-800A-6FB1D4308F34}.Release|x86.ActiveCfg = Release|x86
|
||||||
|
{0B346099-B101-4426-800A-6FB1D4308F34}.Release|x86.Build.0 = Release|x86
|
||||||
EndGlobalSection
|
EndGlobalSection
|
||||||
GlobalSection(SolutionProperties) = preSolution
|
GlobalSection(SolutionProperties) = preSolution
|
||||||
HideSolutionNode = FALSE
|
HideSolutionNode = FALSE
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
|
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
|
||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<TargetFrameworks>netcoreapp3.1;net45;net46</TargetFrameworks>
|
<TargetFrameworks>netcoreapp3.1;net45;net46</TargetFrameworks>
|
||||||
<GenerateDocumentFile>true</GenerateDocumentFile>
|
<GenerateDocumentFile>true</GenerateDocumentFile>
|
||||||
<UseWpf>true</UseWpf>
|
<UseWpf>true</UseWpf>
|
||||||
|
@ -9,30 +9,44 @@
|
||||||
<ApplicationIcon>logo.ico</ApplicationIcon>
|
<ApplicationIcon>logo.ico</ApplicationIcon>
|
||||||
<OutputType>WinExe</OutputType>
|
<OutputType>WinExe</OutputType>
|
||||||
<StartupObject />
|
<StartupObject />
|
||||||
<Platforms>AnyCPU;x64</Platforms>
|
<Platforms>AnyCPU;x64;x86</Platforms>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="AduSkin" Version="1.1.1.8" />
|
<PackageReference Include="AduSkin" Version="1.1.1.8" />
|
||||||
<PackageReference Include="CommonServiceLocator" Version="2.0.5" />
|
<PackageReference Include="CommonServiceLocator" Version="2.0.5" />
|
||||||
<PackageReference Include="MvvmLightLibs" Version="5.4.1.1" />
|
<PackageReference Include="MvvmLightLibs" Version="5.4.1.1" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup Condition="'$(TargetFramework)' != 'net45'">
|
<ItemGroup Condition="'$(TargetFramework)' != 'net45'">
|
||||||
<PackageReference Include="System.Text.Encoding.CodePages" Version="4.7.0" />
|
<PackageReference Include="System.Text.Encoding.CodePages" Version="4.7.0" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Compile Update="Views\Window2.xaml.cs">
|
<Compile Update="Views\Window2.xaml.cs">
|
||||||
<SubType>Code</SubType>
|
<SubType>Code</SubType>
|
||||||
</Compile>
|
</Compile>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<None Update="logo.ico">
|
<None Update="logo.ico">
|
||||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||||
</None>
|
</None>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Page Update="Views\Window2.xaml">
|
<Page Update="Views\Window2.xaml">
|
||||||
<XamlRuntime>$(DefaultXamlRuntime)</XamlRuntime>
|
<XamlRuntime>$(DefaultXamlRuntime)</XamlRuntime>
|
||||||
<SubType>Designer</SubType>
|
<SubType>Designer</SubType>
|
||||||
</Page>
|
</Page>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<Reference Include="ManageLiteAV" Condition="'$(Platform)' == 'x64'">
|
||||||
|
<HintPath>TRTC_SDK\Win64\lib\ManageLiteAV.dll</HintPath>
|
||||||
|
</Reference>
|
||||||
|
<Reference Include="ManageLiteAV" Condition="'$(Platform)' == 'AnyCPU'">
|
||||||
|
<HintPath>TRTC_SDK\Win64\lib\ManageLiteAV.dll</HintPath>
|
||||||
|
</Reference>
|
||||||
|
<Reference Include="ManageLiteAV" Condition="'$(Platform)' == 'x86'">
|
||||||
|
<HintPath>TRTC_SDK\Win32\lib\ManageLiteAV.dll</HintPath>
|
||||||
|
</Reference>
|
||||||
|
</ItemGroup>
|
||||||
|
<Target Name="PostBuild" AfterTargets="PostBuildEvent">
|
||||||
|
<Exec Command="set Platform=Win64
SETLOCAL ENABLEDELAYEDEXPANSION
if $(PlatformName)==x86 ( 
set Platform=Win32
)
copy /Y "$(ProjectDir)TRTC_SDK\!Platform!\lib\*.dll" "$(ProjectDir)$(OutDir)"
ENDLOCAL" />
|
||||||
|
</Target>
|
||||||
</Project>
|
</Project>
|
||||||
|
|
|
@ -31,7 +31,13 @@ namespace JianGongYun
|
||||||
// 不要通过XAML来绑定颜色,无法获取到通知
|
// 不要通过XAML来绑定颜色,无法获取到通知
|
||||||
BorderBrush = Theme.CurrentColor.OpaqueSolidColorBrush;
|
BorderBrush = Theme.CurrentColor.OpaqueSolidColorBrush;
|
||||||
};
|
};
|
||||||
BorderBrush = new SolidColorBrush(color:Color.FromRgb(42,43, 48));
|
BorderBrush = new SolidColorBrush(color: Color.FromRgb(42, 43, 48));
|
||||||
|
|
||||||
|
|
||||||
|
//TRTC集成测试
|
||||||
|
ManageLiteAV.ITRTCCloud lTRTCCloud = ManageLiteAV.ITRTCCloud.getTRTCShareInstance();
|
||||||
|
MessageBox.Show(lTRTCCloud.getSDKVersion());
|
||||||
|
ManageLiteAV.ITRTCCloud.destroyTRTCShareInstance();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
File diff suppressed because it is too large
Load Diff
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
File diff suppressed because it is too large
Load Diff
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading…
Reference in New Issue