jwetzell/qController
1
0
Fork 0
mirror of https://github.com/jwetzell/qController.git synced 2026-08-07 16:33:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

QLab 5 connection changes

Browse Source
This commit is contained in:
Joel Wetzell
2022-11-08 09:47:52 -06:00
parent cd0a673f43
commit dc864f2341
3 changed files with 29 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
qController.Standard/Classes/Communication/QUpdater.cs
+7 -1
View File
@@ -21,8 +21,14 @@ namespace qController.Communication
private void OnConnectionStatusChanged(object source, ConnectEventArgs args)
{
Log.Debug("QUPDATER - Connection Status Changed: " + args.Status);
if (args.Status == "ok")
if (args.Status.Contains("ok"))
{
//new sort of connect format for QLab 5 ok:view|control|edit is connection good
if(args.Status.Contains(":") && !args.Status.Contains("view"))
{
return;
}
qController.qClient.sendTCP("/workspace/" + qController.qWorkspace.workspace_id + "/updates", 1);
qController.qClient.sendTCP("/workspace/" + qController.qWorkspace.workspace_id + "/cueLists");
}
qController.Standard/Classes/QItems/QWorkSpace.cs
+6
View File
@@ -94,6 +94,12 @@ namespace qController.QItems
public bool CheckPopulated()
{
if(data == null)
{
IsPopulated = false;
return false;
}
for (int i = 0; i < data.Count; i++)
{
for (int j = 0; j < data[i].cues.Count; j++)
qController.Standard/Pages/ControlPage.xaml.cs
+16 -5
View File
@@ -67,13 +67,18 @@ namespace qController
private void OnConnectionStatusChanged(object source, ConnectEventArgs args)
{
Log.Debug($"CONTROLPAGE - Connection Status Changed: {args.WorkspaceId} : {args.Status}");
if (args.Status.Equals("ok"))
if (args.Status.Contains("ok"))
{
if(args.Status.Contains(":") && !args.Status.Contains("view"))
{
workspacePrompt.promptWorkspacePasscode(args.WorkspaceId);
return;
}
Device.BeginInvokeOnMainThread(() => {
FinishUI();
});
}
else if (args.Status.Equals("badpass"))
else if (args.Status.Contains("badpass"))
{
workspacePrompt.promptWorkspacePasscode(args.WorkspaceId);
}
@@ -252,6 +257,11 @@ namespace qController
public void WorkspaceUpdated(object sender, WorkspaceEventArgs e)
{
if(e.UpdatedWorkspace.data == null)
{
Log.Debug("[ControlPage] Workspace Update contains null data.");
return;
}
if(e.UpdatedWorkspace.data.Count > 0)
{
qController.qWorkspace = e.UpdatedWorkspace;
@@ -313,10 +323,11 @@ namespace qController
Device.BeginInvokeOnMainThread(() =>
{
Log.Debug("CONTROLPAGE - Refreshing Currently Displayed Cue");
if (args.Cue.levels != null)
if (args.Cue.levels != null) {
Log.Debug("before show levels button and cue.levels isnt null");
showLevelsButton.IsVisible = true;
else
{
Log.Debug("after show levels button and cue.levels isnt null");
} else {
showLevelsButton.IsVisible = false;
qLevelsCell.IsVisible = false;
}