Skip to content
Snippets Groups Projects
Commit 7680cd6e authored by Paul-Winpenny's avatar Paul-Winpenny
Browse files

Added interface to send messages over tcp fro testing

parent 543ca546
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 314 additions and 61 deletions
App/RobobinApp/App.xaml.cs
+ 3
− 3
View file @ 7680cd6e
......@@ -9,7 +9,7 @@ namespace RobobinApp
{
public static IBluetoothLE BluetoothLE { get; private set; }
public static IAdapter BluetoothAdapter { get; private set; }
private WifiManager _wifiManager;
public static WifiManager WifiManager { get; private set; }
public App()
{
......@@ -19,8 +19,8 @@ namespace RobobinApp
InitializeBluetoothAdapter();
_wifiManager = new WifiManager();
Task.Run(() => _wifiManager.StartListening());
WifiManager = new WifiManager();
Task.Run(() => WifiManager.StartListening());
MainPage = new AppShell();
}
......
App/RobobinApp/Networking/WifiManager.cs
+ 115
− 37
View file @ 7680cd6e
......@@ -12,8 +12,12 @@ namespace RobobinApp.Networking
{
private UdpClient _udpClient;
private const int BroadcastPort = 5005;
private bool _isConnected = false; // Flag to indicate connection status
private CancellationTokenSource _cancellationTokenSource; // For stopping the UDP listener
private bool _isConnected = false;
private CancellationTokenSource _cancellationTokenSource;
private TcpClient _tcpClient;
// Event to notify the UI or other parts of the app of specific messages
public event Action<string> OnMessageReceived;
public WifiManager()
{
......@@ -23,22 +27,42 @@ namespace RobobinApp.Networking
public async Task StartListening()
{
while (!_isConnected) // Continue listening until connected
while (true) // Continuous listening loop with reconnection attempts
{
Debug.WriteLine("Waiting for broadcast...");
var result = await _udpClient.ReceiveAsync();
string message = Encoding.ASCII.GetString(result.Buffer);
if (_isConnected)
{
Debug.WriteLine("Already connected. Stopping further listening.");
break;
}
if (message == "ROBOBIN_PRESENT")
try
{
Debug.WriteLine("Waiting for broadcast...");
var result = await _udpClient.ReceiveAsync();
string message = Encoding.ASCII.GetString(result.Buffer);
if (message == "ROBOBIN_PRESENT")
{
Debug.WriteLine("Detected Robobin presence from: " + result.RemoteEndPoint);
SendConnectMessage(result.RemoteEndPoint.Address.ToString());
}
}
catch (ObjectDisposedException)
{
Debug.WriteLine("Detected Robobin presence from: " + result.RemoteEndPoint);
SendConnectMessage(result.RemoteEndPoint.Address.ToString());
Debug.WriteLine("UDP client has been closed.");
break;
}
catch (Exception ex)
{
Debug.WriteLine($"Error in UDP listening: {ex.Message}");
}
}
// Stop listening if connected
Debug.WriteLine("Stopping UDP listener.");
_udpClient.Close();
// Retry delay if not connected
if (!_isConnected)
{
await Task.Delay(3000); // Wait 3 seconds before retrying
}
}
}
public void SendConnectMessage(string ipAddress)
......@@ -56,53 +80,107 @@ namespace RobobinApp.Networking
Task.Run(() => ConnectToTcpServer(endPoint));
}
public async Task SendPingMessage(TcpClient tcpClient)
public async Task SendMessageAsync(string message)
{
if (!_isConnected)
if (!_isConnected || _tcpClient == null)
{
Debug.WriteLine("Not connected. Cannot send ping message.");
Debug.WriteLine("Not connected. Cannot send message.");
return;
}
try
{
NetworkStream stream = tcpClient.GetStream();
byte[] pingMessage = Encoding.ASCII.GetBytes("PING");
await stream.WriteAsync(pingMessage, 0, pingMessage.Length);
Debug.WriteLine("Sent PING message to Robobin.");
NetworkStream stream = _tcpClient.GetStream();
byte[] data = Encoding.ASCII.GetBytes(message);
await stream.WriteAsync(data, 0, data.Length);
Debug.WriteLine($"Sent message: {message}");
}
catch (Exception ex)
{
Debug.WriteLine($"Failed to send PING message: {ex.Message}");
Debug.WriteLine($"Failed to send message: {ex.Message}");
_isConnected = false; // Reset connection status to retry
await StartListening(); // Restart listening for reconnection
}
}
public async Task SendPingMessage()
{
await SendMessageAsync("PING");
}
private async Task ConnectToTcpServer(IPEndPoint endPoint)
{
using (TcpClient tcpClient = new TcpClient())
_tcpClient = new TcpClient();
try
{
try
{
await tcpClient.ConnectAsync(endPoint.Address, endPoint.Port);
Debug.WriteLine("Connected to Robobin via TCP.");
await _tcpClient.ConnectAsync(endPoint.Address, endPoint.Port);
Debug.WriteLine("Connected to Robobin via TCP.");
_isConnected = true;
_isConnected = true;
Task.Run(() => ReceiveMessages());
// Keep the connection open to send PING messages periodically
while (_isConnected)
}
catch (Exception ex)
{
Debug.WriteLine($"TCP connection failed: {ex.Message}");
_isConnected = false; // Reset connection status
await StartListening(); // Retry listening for presence broadcast
}
// If TCP connection is lost, attempt to reconnect
_cancellationTokenSource.Cancel(); // Stop the current listening task
}
private async Task ReceiveMessages()
{
if (_tcpClient == null)
return;
NetworkStream stream = _tcpClient.GetStream();
byte[] buffer = new byte[1024];
try
{
while (_isConnected)
{
int byteCount = await stream.ReadAsync(buffer, 0, buffer.Length);
if (byteCount <= 0)
{
await SendPingMessage(tcpClient);
await Task.Delay(5000); // Send a ping every 5 seconds
Debug.WriteLine("Disconnected from server.");
_isConnected = false;
break;
}
}
catch (Exception ex)
{
Debug.WriteLine($"TCP connection failed: {ex.Message}");
string receivedMessage = Encoding.ASCII.GetString(buffer, 0, byteCount);
Debug.WriteLine($"Received message: {receivedMessage}");
// Trigger alert or handle specific messages
HandleReceivedMessage(receivedMessage);
}
}
_cancellationTokenSource.Cancel(); // Cancel the token to stop the UDP listener
catch (Exception ex)
{
Debug.WriteLine($"Error receiving message: {ex.Message}");
_isConnected = false;
await StartListening(); // Restart listening if disconnected
}
}
private void HandleReceivedMessage(string message)
{
if (message == "PONG")
{
OnMessageReceived?.Invoke("Received PONG from Robobin");
Debug.WriteLine("PONG received, alert triggered.");
}
else
{
OnMessageReceived?.Invoke($"RM: {message}");
}
}
}
}
App/RobobinApp/Resources/Styles/appstyle.css
+ 4
− 0
View file @ 7680cd6e
......@@ -157,3 +157,7 @@ stacklayout > image {
background-color: #E8EDF1;
padding: 10;
}
.sideBox button.button-primary {
background-color: #647687;
color: #FFFFFF;
}
App/RobobinApp/RobobinApp.csproj
+ 7
− 1
View file @ 7680cd6e
......@@ -71,6 +71,9 @@
<Compile Update="Views\MainPage_Android.xaml.cs">
<DependentUpon>MainPage_Android.xaml</DependentUpon>
</Compile>
<Compile Update="Views\Sides\AdminBox.xaml.cs">
<DependentUpon>AdminBox.xaml</DependentUpon>
</Compile>
</ItemGroup>
<ItemGroup>
......@@ -86,7 +89,10 @@
<MauiXaml Update="Views\MainPage_Android.xaml">
<Generator>MSBuild:Compile</Generator>
</MauiXaml>
<MauiXaml Update="Views\SideBox.xaml">
<MauiXaml Update="Views\Sides\AdminBox.xaml">
<Generator>MSBuild:Compile</Generator>
</MauiXaml>
<MauiXaml Update="Views\Sides\SideBox.xaml">
<Generator>MSBuild:Compile</Generator>
</MauiXaml>
</ItemGroup>
......
App/RobobinApp/RobobinApp.csproj.user
+ 4
− 1
View file @ 7680cd6e
......@@ -32,7 +32,10 @@
<MauiXaml Update="Views\MainPage_Android.xaml">
<SubType>Designer</SubType>
</MauiXaml>
<MauiXaml Update="Views\SideBox.xaml">
<MauiXaml Update="Views\Sides\AdminBox.xaml">
<SubType>Designer</SubType>
</MauiXaml>
<MauiXaml Update="Views\Sides\SideBox.xaml">
<SubType>Designer</SubType>
</MauiXaml>
</ItemGroup>
......
App/RobobinApp/Views/MainPage.xaml
+ 5
− 4
View file @ 7680cd6e
......@@ -2,6 +2,7 @@
<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
xmlns:local="clr-namespace:RobobinApp.Views"
xmlns:sides ="clr-namespace:RobobinApp.Views.Sides"
xmlns:viewModels="clr-namespace:RobobinApp.ViewModels"
xmlns:drawable="clr-namespace:RobobinApp.Views"
x:Class="RobobinApp.Views.MainPage"
......@@ -36,8 +37,8 @@
<Button Text="Setup" Command="{Binding ConnectToRobobinCommand}"/>
</HorizontalStackLayout>
<local:SideBox HeaderTitle="Queue:" />
<local:SideBox HeaderTitle="Status:" />
<sides:SideBox HeaderTitle="Queue:" />
<sides:SideBox HeaderTitle="Status:" />
</VerticalStackLayout>
<Frame StyleClass="mainFrame"
......@@ -67,8 +68,8 @@
</HorizontalStackLayout>
<local:SideBox HeaderTitle="Mode:" />
<local:SideBox HeaderTitle="Admin:" />
<sides:SideBox HeaderTitle="Mode:" />
<sides:AdminBox HeaderTitle="Admin:" />
</VerticalStackLayout>
</Grid>
......
App/RobobinApp/Views/MainPage_Android.xaml
+ 5
− 4
View file @ 7680cd6e
......@@ -3,6 +3,7 @@
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
xmlns:local="clr-namespace:RobobinApp.Views"
xmlns:viewModels="clr-namespace:RobobinApp.ViewModels"
xmlns:sides ="clr-namespace:RobobinApp.Views.Sides"
xmlns:drawable="clr-namespace:RobobinApp.Views"
x:Class="RobobinApp.Views.MainPage_Android"
Title="">
......@@ -36,8 +37,8 @@
HorizontalOptions="Center" />
</HorizontalStackLayout>
<local:SideBox HeaderTitle="Queue:" />
<local:SideBox HeaderTitle="Status:" />
<sides:SideBox HeaderTitle="Queue:" />
<sides:SideBox HeaderTitle="Status:" />
</VerticalStackLayout>
<!-- Main Drawable Area with specific HeightRequest to ensure visibility -->
......@@ -60,8 +61,8 @@
VerticalOptions="End">
<local:SideBox HeaderTitle="Mode:" />
<local:SideBox HeaderTitle="Admin:" />
<sides:SideBox HeaderTitle="Mode:" />
<sides:AdminBox HeaderTitle="Admin:" />
</VerticalStackLayout>
</VerticalStackLayout>
......
App/RobobinApp/Views/Sides/AdminBox.xaml 0 → 100644
+ 52
− 0
View file @ 7680cd6e
<?xml version="1.0" encoding="utf-8" ?>
<ContentView xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
x:Class="RobobinApp.Views.Sides.AdminBox"
class="sideBox">
<Frame class="side-box-frame">
<VerticalStackLayout>
<Grid class="side-box-header">
<Label x:Name="HeaderText"
Text="Admin:"
class="side-box-header-text"/>
</Grid>
<ScrollView class="side-box-content">
<VerticalStackLayout>
<HorizontalStackLayout>
<Label Text="Send TCP Message:"/>
<Entry x:Name="TcpMessageEntry"
Placeholder="Type message here"
BackgroundColor="#FFFFFF"
Grid.Column="0"
HorizontalOptions="FillAndExpand"
Margin="0"/>
<Button Text="Send"
Clicked="OnSendMessageClicked"
class="button-primary"
Grid.Column="1"
HorizontalOptions="End"
Margin="0"/>
</HorizontalStackLayout>
<HorizontalStackLayout>
<Label Text="Latest Message:" Margin="0,10,0,5"/>
<Frame class="primaryFrame">
<Label x:Name="LatestMessageLabel" TextColor="White"
Text="No messages yet."
/>
</Frame>
</HorizontalStackLayout>
</VerticalStackLayout>
</ScrollView>
</VerticalStackLayout>
</Frame>
</ContentView>
App/RobobinApp/Views/Sides/AdminBox.xaml.cs 0 → 100644
+ 76
− 0
View file @ 7680cd6e
using System;
using Microsoft.Maui.Controls;
namespace RobobinApp.Views.Sides
{
public partial class AdminBox : ContentView
{
public static readonly BindableProperty HeaderTitleProperty =
BindableProperty.Create(nameof(HeaderTitle),
typeof(string),
typeof(AdminBox),
defaultValue: "Admin:",
propertyChanged: OnHeaderTitleChanged);
public string HeaderTitle
{
get => (string)GetValue(HeaderTitleProperty);
set => SetValue(HeaderTitleProperty, value);
}
public AdminBox()
{
InitializeComponent();
App.WifiManager.OnMessageReceived += UpdateLatestMessage;
}
private void UpdateLatestMessage(string message)
{
MainThread.BeginInvokeOnMainThread(() =>
{
LatestMessageLabel.Text = message;
});
}
private async void OnSendMessageClicked(object sender, EventArgs e)
{
string messageToSend = TcpMessageEntry.Text;
if (!string.IsNullOrWhiteSpace(messageToSend))
{
await App.WifiManager.SendMessageAsync(messageToSend);
TcpMessageEntry.Text = string.Empty;
}
else
{
await Application.Current.MainPage.DisplayAlert("Error", "Please enter a message to send.", "OK");
}
}
protected static void OnHeaderTitleChanged(BindableObject bindable, object oldValue, object newValue)
{
var control = (AdminBox)bindable;
if (control.HeaderText != null)
{
control.HeaderText.Text = newValue?.ToString();
}
}
protected override void OnParentChanged()
{
base.OnParentChanged();
if (Parent == null)
{
App.WifiManager.OnMessageReceived -= UpdateLatestMessage;
}
}
}
}
App/RobobinApp/Views/SideBox.xaml → App/RobobinApp/Views/Sides/SideBox.xaml
+ 1
− 1
View file @ 7680cd6e
<?xml version="1.0" encoding="utf-8" ?>
<ContentView xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
x:Class="RobobinApp.Views.SideBox"
x:Class="RobobinApp.Views.Sides.SideBox"
StyleClass="SideBox">
<Frame StyleClass="side-box-frame">
<VerticalStackLayout>
......
App/RobobinApp/Views/SideBox.xaml.cs → App/RobobinApp/Views/Sides/SideBox.xaml.cs
+ 1
− 1
View file @ 7680cd6e
namespace RobobinApp.Views
namespace RobobinApp.Views.Sides
{
public partial class SideBox : ContentView
{
......
Connectivity/SampleServerPi.py
+ 41
− 9
View file @ 7680cd6e
......@@ -16,20 +16,54 @@ def broadcast_presence():
print("Broadcasting: {}".format(message.decode()))
time.sleep(5)
def handle_ping(client_socket):
print("Received PING from client.")
response = b"PONG"
print("Sending PONG to client.")
client_socket.sendall(response)
def handle_time_request(client_socket):
current_time = time.ctime().encode()
print(f"Sending current time: {current_time.decode()}")
client_socket.sendall(current_time)
def handle_custom_message(client_socket, message):
response = f"Received custom message: {message}".encode()
print(f"Custom handler response: {response.decode()}")
client_socket.sendall(response)
def handle_unknown_message(client_socket):
response = b"I don't know this message."
print("Sending response to unknown message.")
client_socket.sendall(response)
message_handlers = {
"PING": handle_ping,
"TIME": handle_time_request,
"CUSTOM": handle_custom_message,
}
def handle_client_connection(client_socket):
try:
while True:
request = client_socket.recv(1024)
if not request:
print("No request received, closing connection.")
break # Connection closed by the client
break
message = request.decode()
print("Received from client: {}".format(message))
if message == "PING":
print("Received PING from client.")
response = b"PONG"
client_socket.sendall(response)
parts = message.split(" ", 1)
message_type = parts[0]
message_data = parts[1] if len(parts) > 1 else None
if message_type in message_handlers:
if message_type == "CUSTOM" and message_data:
message_handlers[message_type](client_socket, message_data)
else:
message_handlers[message_type](client_socket)
else:
handle_unknown_message(client_socket)
except ConnectionResetError:
print("Client connection was forcibly closed.")
......@@ -49,21 +83,19 @@ def listen_for_connections():
if data.decode() == "CONNECT":
print("Received connection request from {}".format(addr))
# Create a TCP socket to accept connections
with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as tcp_socket:
tcp_socket.bind(('', 5006)) # Listen on the fixed TCP port
tcp_socket.bind(('', 5006))
tcp_socket.listen(1)
print("Listening for TCP connection...")
client_socket, client_addr = tcp_socket.accept()
print("Client connected from {}".format(client_addr))
# Spawn a new thread for handling the client connection
threading.Thread(target=handle_client_connection, args=(client_socket,)).start()
except Exception as e:
print(f"An error occurred while listening for connections: {e}")
# Start the broadcasting and listening in separate threads
# Start broadcasting and listening threads
broadcast_thread = threading.Thread(target=broadcast_presence)
listen_thread = threading.Thread(target=listen_for_connections)
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment