jwetzell/qController
1
0
Fork 0
mirror of https://github.com/jwetzell/qController.git synced 2026-08-21 06:59:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Work on initial connection crashes

Browse Source
This commit is contained in:
jwetzell
2019-07-11 10:42:42 -05:00
parent c241fbd2d0
commit 14f42852aa
3 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
qController.Standard/Classes/Communication/QController.cs
+2 -1
View File
@@ -22,7 +22,7 @@ namespace qController
{ {
qClient = new QClient(address, port); qClient = new QClient(address, port);
qUpdater = new QUpdater(this); qUpdater = new QUpdater(this);
qUpdater.Start();
//Connect(); //Connect();
//Connect(); //Connect();
//KickOff(); //KickOff();
@@ -34,6 +34,7 @@ namespace qController
Console.WriteLine("QCONTROLLER CONNECT CALLED: " + workspace_id); Console.WriteLine("QCONTROLLER CONNECT CALLED: " + workspace_id);
qWorkspace = new QWorkSpace(); qWorkspace = new QWorkSpace();
qWorkspace.workspace_id = workspace_id; qWorkspace.workspace_id = workspace_id;
qUpdater.Start();
qClient.sendStringUDP("/connect"); qClient.sendStringUDP("/connect");
qClient.sendArgsUDP("/workspace/"+workspace_id+"/updates", 1); qClient.sendArgsUDP("/workspace/"+workspace_id+"/updates", 1);
qClient.sendAndReceiveString("/workspace/"+workspace_id+"/cueLists"); qClient.sendAndReceiveString("/workspace/"+workspace_id+"/cueLists");
qController.Standard/Pages/ControlPage.xaml
+2 -1
View File
@@ -10,7 +10,8 @@
<ColumnDefinition Width="*" /> <ColumnDefinition Width="*" />
<ColumnDefinition Width="*" /> <ColumnDefinition Width="*" />
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<Label x:Name = "menuButton" FontFamily = "{StaticResource qfont}" HorizontalOptions = "Start" Margin="20,10,20,10" Grid.Row="0" Grid.Column="0" FontSize="25"/> <Label x:Name = "menuButton" FontFamily = "{StaticResource qfont}" HorizontalOptions = "Start" VerticalOptions="End" Margin="20,10,20,10" Grid.Row="0" Grid.Column="0" FontSize="25"/>
<Label x:Name = "instanceName" HorizontalTextAlignment="Center" HorizontalOptions = "CenterAndExpand" VerticalOptions="End" Margin="20,10,20,10" Grid.Row="0" Grid.Column="1"/>
</Grid> </Grid>
</StackLayout> </StackLayout>
</ContentPage.Content> </ContentPage.Content>
qController.Standard/Pages/ControlPage.xaml.cs
+7 -8
View File
@@ -8,7 +8,6 @@ namespace qController
public partial class ControlPage : ContentPage public partial class ControlPage : ContentPage
{ {
QController qController; QController qController;
Label instanceName = new Label();
QSelectedCueCell qCell; QSelectedCueCell qCell;
QSelectedCueOptionsCell qSelectedCueOptions; QSelectedCueOptionsCell qSelectedCueOptions;
Grid mainG; Grid mainG;
@@ -74,23 +73,23 @@ namespace qController
App.rootPage.MenuPage.ChangeToControl(); App.rootPage.MenuPage.ChangeToControl();
NavigationPage.SetHasNavigationBar(this, false); NavigationPage.SetHasNavigationBar(this, false);
instanceName.HorizontalTextAlignment = TextAlignment.Center;
instanceName.HorizontalOptions = LayoutOptions.CenterAndExpand;
instanceName.VerticalOptions = LayoutOptions.CenterAndExpand;
topBar.Children.Add(instanceName, 1, 0);
topBar.BackgroundColor = Color.FromHex("71AEFF"); topBar.BackgroundColor = Color.FromHex("71AEFF");
topBar.HeightRequest = Math.Max(App.Height * .09, 65); topBar.HeightRequest = Math.Max(App.Height * .09, 65);
BackgroundColor = Color.FromHex("4A4A4A"); BackgroundColor = Color.FromHex("4A4A4A");
menuButton.Text = QIcon.MENU; menuButton.Text = QIcon.MENU;
switch (Device.RuntimePlatform) switch (Device.RuntimePlatform)
{ {
case Device.iOS: case Device.iOS:
menuButton.Margin = new Thickness(20, 35, 20, 10); menuButton.Margin = new Thickness(App.WidthUnit * 2, 0, 0, App.WidthUnit * 2);
instanceName.Margin = new Thickness(20, 35, 20, 10); menuButton.FontSize = App.Height * .04;
break;
case Device.Android:
menuButton.Margin = new Thickness(App.WidthUnit * 2, 0, 0, App.WidthUnit * 2);
menuButton.FontSize = App.Height * .04;
break; break;
} }
var menuButtonGesture = new TapGestureRecognizer(); var menuButtonGesture = new TapGestureRecognizer();