Skip to content
Snippets Groups Projects
Commit 1c301816 authored by ginoecb's avatar ginoecb
Browse files

Adding conditional_events files

parent 9c4baafe
No related branches found
No related tags found
No related merge requests found
Showing
with 148 additions and 75 deletions
......@@ -67,7 +67,6 @@ Global
{81835095-F937-4D1D-A4FE-41B24047C8C6}.Debug|x64.Deploy.0 = Debug|x64
{81835095-F937-4D1D-A4FE-41B24047C8C6}.Debug|x86.ActiveCfg = Debug|x86
{81835095-F937-4D1D-A4FE-41B24047C8C6}.Debug|x86.Build.0 = Debug|x86
{81835095-F937-4D1D-A4FE-41B24047C8C6}.Debug|x86.Deploy.0 = Debug|x86
{81835095-F937-4D1D-A4FE-41B24047C8C6}.Release|Any CPU.ActiveCfg = Release|x86
{81835095-F937-4D1D-A4FE-41B24047C8C6}.Release|ARM.ActiveCfg = Release|ARM
{81835095-F937-4D1D-A4FE-41B24047C8C6}.Release|ARM.Build.0 = Release|ARM
......
......@@ -12,7 +12,7 @@
<DefaultLanguage>en-US</DefaultLanguage>
<TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
<TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.17763.0</TargetPlatformVersion>
<TargetPlatformMinVersion>10.0.15063.0</TargetPlatformMinVersion>
<TargetPlatformMinVersion>10.0.10586.0</TargetPlatformMinVersion>
<MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
<FileAlignment>512</FileAlignment>
<ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
......@@ -25,13 +25,14 @@
<PackageCertificateThumbprint>F71A1E23B007F5048A25EA2866FFFB83FF9FA45F</PackageCertificateThumbprint>
<AppInstallerUpdateFrequency>1</AppInstallerUpdateFrequency>
<AppInstallerCheckForUpdateFrequency>OnApplicationRun</AppInstallerCheckForUpdateFrequency>
<AppxPackageDir>E:\Apollo Lens\Client\v7\</AppxPackageDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
<DebugSymbols>true</DebugSymbols>
<OutputPath>bin\x86\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
<NoWarn>;2008</NoWarn>
<DebugType>full</DebugType>
<DebugType>pdbonly</DebugType>
<PlatformTarget>x86</PlatformTarget>
<UseVSHostingProcess>false</UseVSHostingProcess>
<ErrorReport>prompt</ErrorReport>
......
......@@ -19,10 +19,6 @@ namespace ApolloLensClient
{
private IConductor conductor { get; } = Conductor.Instance;
// Added
private bool ConnectToComm = false;
private bool ConnectToSource = false;
public MainPage()
{
this.DataContext = this;
......@@ -60,7 +56,8 @@ namespace ApolloLensClient
var config = new ConductorConfig()
{
CoreDispatcher = this.Dispatcher,
RemoteVideo = this.RemoteVideo,
RemoteVideoFromComm = this.RemoteVideo,
RemoteVideoFromSource = this.RemoteVideo,
Signaller = signaller
};
......@@ -69,8 +66,9 @@ namespace ApolloLensClient
var opts = new MediaOptions(
new MediaOptions.Init()
{
ReceiveVideo = true
});
ReceiveVideoFromComm = true,
ReceiveVideoFromSource = true
}) ;
this.conductor.SetMediaOptions(opts);
this.conductor.UISignaller.ReceivedShutdown += async (s, a) =>
......@@ -80,17 +78,7 @@ namespace ApolloLensClient
this.conductor.UISignaller.ReceivedPlain += (s, message) =>
{
if (message == "COMM_READY")
{
Logger.Log("Starting call....");
this.conductor.StartCall();
//this.conductor.StartCall2();
}
else
{
Logger.Log(message);
}
//Logger.Log(message);
Logger.Log(message);
};
}
......@@ -99,36 +87,17 @@ namespace ApolloLensClient
private async void SayHiButton_Click(object sender, RoutedEventArgs e)
{
var message = "Hello World!";
var message = "Hello, World!";
await this.conductor.UISignaller.SendPlain(message);
Logger.Log($"Sent {message} to any connected peers");
}
private async void SourceConnectButton_Click(object sender, RoutedEventArgs e)
{
//Logger.Log("Starting connection to source...");
//await this.conductor.StartCall();
//Logger.Log("Connection started...");
// TODO: Change this
if (!ConnectToComm)
{
Logger.Log("Connecting to Comm ...");
await this.conductor.UISignaller.SendPlain("COMM");
//this.conductor.Fak();
ConnectToComm = true;
}
/*else if (!ConnectedToSource)
{
Logger.Log("Connecting to Source");
await this.conductor.UISignaller.SendPlain("SOURCE");
ConnectedToSource = true;
}*/
else
{
Logger.Log("Connection in progress, please wait");
}
Logger.Log("Starting connection to source...");
//await this.conductor.StartCallToComm();
await this.conductor.StartCallToSource();
Logger.Log("Connection started...");
}
#endregion
......
<?xml version="1.0" encoding="utf-8"?>
<Package xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10" xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest" xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" IgnorableNamespaces="uap mp">
<Identity Name="aa28b873-1b51-4698-834f-4fa9cce86bd5" Publisher="CN=nkeuning" Version="1.0.0.0" />
<Identity Name="aa28b873-1b51-4698-834f-4fa9cce86bd5" Publisher="CN=nkeuning" Version="1.0.3.0" />
<mp:PhoneIdentity PhoneProductId="aa28b873-1b51-4698-834f-4fa9cce86bd5" PhonePublisherId="00000000-0000-0000-0000-000000000000" />
<Properties>
<DisplayName>ApolloLensClient</DisplayName>
......
......@@ -12,7 +12,7 @@
<DefaultLanguage>en-US</DefaultLanguage>
<TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
<TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.17763.0</TargetPlatformVersion>
<TargetPlatformMinVersion>10.0.15063.0</TargetPlatformMinVersion>
<TargetPlatformMinVersion>10.0.10586.0</TargetPlatformMinVersion>
<MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
<FileAlignment>512</FileAlignment>
<ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
......@@ -20,6 +20,7 @@
<PackageCertificateKeyFile>ApolloLensClient_TemporaryKey.pfx</PackageCertificateKeyFile>
<GenerateAppInstallerFile>False</GenerateAppInstallerFile>
<AppxAutoIncrementPackageRevision>True</AppxAutoIncrementPackageRevision>
<AppxPackageDir>E:\Apollo Lens\Comm\v7\</AppxPackageDir>
<AppxBundle>Always</AppxBundle>
<AppxBundlePlatforms>x86</AppxBundlePlatforms>
<PackageCertificateThumbprint>F71A1E23B007F5048A25EA2866FFFB83FF9FA45F</PackageCertificateThumbprint>
......
ApolloLensComm/Assets/LockScreenLogo.scale-200.png

1.4 KiB

ApolloLensComm/Assets/SplashScreen.scale-200.png

7.52 KiB

ApolloLensComm/Assets/Square150x150Logo.scale-200.png

2.87 KiB

ApolloLensComm/Assets/Square44x44Logo.scale-200.png

1.61 KiB

ApolloLensComm/Assets/Square44x44Logo.targetsize-24_altform-unplated.png

1.23 KiB

ApolloLensComm/Assets/StoreLogo.png

1.42 KiB

ApolloLensComm/Assets/Wide310x150Logo.scale-200.png

3.13 KiB

......@@ -67,7 +67,7 @@ namespace ApolloLensComm
CoreDispatcher = this.Dispatcher,
Signaller = signaller,
LocalVideo = this.LocalVideo,
RemoteVideo = this.RemoteVideo
RemoteVideoFromSource = this.RemoteVideo
};
Logger.Log("Initializing WebRTC...");
......@@ -78,7 +78,7 @@ namespace ApolloLensComm
new MediaOptions.Init()
{
SendVideo = true,
ReceiveVideo = true,
ReceiveVideoFromSource = true,
LocalLoopback = true
});
this.conductor.SetMediaOptions(opts);
......@@ -90,16 +90,7 @@ namespace ApolloLensComm
this.conductor.UISignaller.ReceivedPlain += (s, message) =>
{
if (message == "COMM")
{
this.conductor.Reinitialize(config);
this.conductor.UISignaller.SendPlain("COMM_READY");
}
else if (message != "SOURCE")
{
Logger.Log(message);
}
//Logger.Log(message);
Logger.Log(message);
};
var devices = await this.conductor.GetVideoDevices();
......@@ -139,7 +130,7 @@ namespace ApolloLensComm
private async void StartCallButton_Click(object sender, RoutedEventArgs e)
{
Logger.Log("Starting connection to peer...");
await this.conductor.StartCall();
await this.conductor.StartCallToSource();
Logger.Log("Connection started...");
}
......
<?xml version="1.0" encoding="utf-8"?>
<Package
xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10"
xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest"
xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10"
IgnorableNamespaces="uap mp">
<Identity
Name="3cd30612-6518-4fc9-b6bd-f62ab22565c8"
Publisher="CN=nkeuning"
Version="1.0.3.0" />
<mp:PhoneIdentity PhoneProductId="3cd30612-6518-4fc9-b6bd-f62ab22565c8" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
<Properties>
<DisplayName>ApolloLensComm</DisplayName>
<PublisherDisplayName>nkeuning</PublisherDisplayName>
<Logo>Assets\StoreLogo.png</Logo>
</Properties>
<Dependencies>
<TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.0.0" MaxVersionTested="10.0.0.0" />
</Dependencies>
<Resources>
<Resource Language="x-generate"/>
</Resources>
<Applications>
<Application Id="App"
Executable="$targetnametoken$.exe"
EntryPoint="ApolloLensComm.App">
<uap:VisualElements
DisplayName="ApolloLensComm"
Square150x150Logo="Assets\Square150x150Logo.png"
Square44x44Logo="Assets\Square44x44Logo.png"
Description="ApolloLensComm"
BackgroundColor="transparent">
<uap:DefaultTile Wide310x150Logo="Assets\Wide310x150Logo.png"/>
<uap:SplashScreen Image="Assets\SplashScreen.png" />
</uap:VisualElements>
</Application>
</Applications>
<Capabilities>
<Capability Name="internetClient" />
<Capability Name="internetClientServer" />
<Capability Name="privateNetworkClientServer" />
<DeviceCapability Name="webcam" />
<DeviceCapability Name="microphone" /> </Capabilities>
</Package>
\ No newline at end of file
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle("ApolloLensClient")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("ApolloLensClient")]
[assembly: AssemblyCopyright("Copyright © 2019")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
// Version information for an assembly consists of the following four values:
//
// Major Version
// Minor Version
// Build Number
// Revision
//
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
[assembly: ComVisible(false)]
\ No newline at end of file
<!--
This file contains Runtime Directives used by .NET Native. The defaults here are suitable for most
developers. However, you can modify these parameters to modify the behavior of the .NET Native
optimizer.
Runtime Directives are documented at https://go.microsoft.com/fwlink/?LinkID=391919
To fully enable reflection for App1.MyClass and all of its public/private members
<Type Name="App1.MyClass" Dynamic="Required All"/>
To enable dynamic creation of the specific instantiation of AppClass<T> over System.Int32
<TypeInstantiation Name="App1.AppClass" Arguments="System.Int32" Activate="Required Public" />
Using the Namespace directive to apply reflection policy to all the types in a particular namespace
<Namespace Name="DataClasses.ViewModels" Serialize="All" />
-->
<Directives xmlns="http://schemas.microsoft.com/netfx/2013/01/metadata">
<Application>
<!--
An Assembly element with Name="*Application*" applies to all assemblies in
the application package. The asterisks are not wildcards.
-->
<Assembly Name="*Application*" Dynamic="Required All" />
<Type Name="Org.WebRtc.RTCSdpType" MarshalObject="Required All" />
<Type Name="Org.WebRtc.RTCIceCandidate" MarshalObject="Required All" />
<Type Name="Org.WebRtc.RTCSessionDescription" MarshalObject="Required All" />
<!-- Add your application specific runtime directives here. -->
</Application>
</Directives>
\ No newline at end of file
......@@ -12,12 +12,20 @@
<DefaultLanguage>en-US</DefaultLanguage>
<TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
<TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.17763.0</TargetPlatformVersion>
<TargetPlatformMinVersion>10.0.15063.0</TargetPlatformMinVersion>
<TargetPlatformMinVersion>10.0.10586.0</TargetPlatformMinVersion>
<MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
<FileAlignment>512</FileAlignment>
<ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<WindowsXamlEnableOverview>true</WindowsXamlEnableOverview>
<PackageCertificateKeyFile>ApolloLensSource_TemporaryKey.pfx</PackageCertificateKeyFile>
<GenerateAppInstallerFile>False</GenerateAppInstallerFile>
<AppxAutoIncrementPackageRevision>True</AppxAutoIncrementPackageRevision>
<AppxPackageDir>E:\Apollo Lens\Source\v7\</AppxPackageDir>
<AppxBundle>Always</AppxBundle>
<AppxBundlePlatforms>x86</AppxBundlePlatforms>
<PackageCertificateThumbprint>F71A1E23B007F5048A25EA2866FFFB83FF9FA45F</PackageCertificateThumbprint>
<AppInstallerUpdateFrequency>1</AppInstallerUpdateFrequency>
<AppInstallerCheckForUpdateFrequency>OnApplicationRun</AppInstallerCheckForUpdateFrequency>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
<DebugSymbols>true</DebugSymbols>
......
......@@ -87,18 +87,7 @@ namespace ApolloLensSource
this.conductor.UISignaller.ReceivedPlain += (s, message) =>
{
if (message == "COMM")
{
Logger.Log(message);
// Disconnect from Server
this.Connected.Hide();
signaller.DisconnectFromServer();
this.NotConnected.Show();
}
else
{
Logger.Log(message);
}
Logger.Log(message);
};
var devices = await this.conductor.GetVideoDevices();
......
<?xml version="1.0" encoding="utf-8"?>
<Package xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10" xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest" xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" IgnorableNamespaces="uap mp">
<Identity Name="84c72b43-5895-43ab-b61c-6d4a31368b3e" Publisher="CN=nkeuning" Version="1.0.0.0" />
<Identity Name="84c72b43-5895-43ab-b61c-6d4a31368b3e" Publisher="CN=nkeuning" Version="1.0.2.0" />
<mp:PhoneIdentity PhoneProductId="84c72b43-5895-43ab-b61c-6d4a31368b3e" PhonePublisherId="00000000-0000-0000-0000-000000000000" />
<Properties>
<DisplayName>ApolloLensSource</DisplayName>
......
......@@ -12,7 +12,7 @@
<DefaultLanguage>en-US</DefaultLanguage>
<TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
<TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.17763.0</TargetPlatformVersion>
<TargetPlatformMinVersion>10.0.15063.0</TargetPlatformMinVersion>
<TargetPlatformMinVersion>10.0.10586.0</TargetPlatformMinVersion>
<MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
<FileAlignment>512</FileAlignment>
<ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment