From 7ce4ae40736d38a0e977e166ec9b8725fab52d7c Mon Sep 17 00:00:00 2001 From: jwetzell Date: Thu, 18 Apr 2019 09:50:06 -0500 Subject: [PATCH] Send "/thump" at 5 sec intervals to keep alive --- .../add.imageset/Contents.json | 84 ------------------ iOS/Assets.xcassets/add.imageset/add.png | Bin 377 -> 0 bytes iOS/Assets.xcassets/add.imageset/add@2x.png | Bin 749 -> 0 bytes qController.Standard/.DS_Store | Bin 10244 -> 10244 bytes .../Classes/Communication/IPHelper.cs | 18 ++++ .../Classes/Communication/QParser.cs | 2 + .../Classes/Communication/QUpdater.cs | 14 +-- .../Settings/MenuPageitem.cs} | 2 +- qController.Standard/Pages/MenuPage.xaml.cs | 20 ++--- qController.Standard/Pages/RootPage.xaml.cs | 2 +- 10 files changed, 36 insertions(+), 106 deletions(-) delete mode 100644 iOS/Assets.xcassets/add.imageset/Contents.json delete mode 100644 iOS/Assets.xcassets/add.imageset/add.png delete mode 100644 iOS/Assets.xcassets/add.imageset/add@2x.png create mode 100644 qController.Standard/Classes/Communication/IPHelper.cs rename qController.Standard/{Pages/MasterPageItem.cs => Classes/Settings/MenuPageitem.cs} (84%) diff --git a/iOS/Assets.xcassets/add.imageset/Contents.json b/iOS/Assets.xcassets/add.imageset/Contents.json deleted file mode 100644 index 5dc2292..0000000 --- a/iOS/Assets.xcassets/add.imageset/Contents.json +++ /dev/null @@ -1,84 +0,0 @@ -{ - "images": [ - { - "idiom": "universal" - }, - { - "filename": "add.png", - "scale": "1x", - "idiom": "universal" - }, - { - "filename": "add@2x.png", - "scale": "2x", - "idiom": "universal" - }, - { - "scale": "3x", - "idiom": "universal" - }, - { - "idiom": "iphone" - }, - { - "scale": "1x", - "idiom": "iphone" - }, - { - "scale": "2x", - "idiom": "iphone" - }, - { - "subtype": "retina4", - "scale": "2x", - "idiom": "iphone" - }, - { - "scale": "3x", - "idiom": "iphone" - }, - { - "idiom": "ipad" - }, - { - "scale": "1x", - "idiom": "ipad" - }, - { - "scale": "2x", - "idiom": "ipad" - }, - { - "idiom": "watch" - }, - { - "scale": "2x", - "idiom": "watch" - }, - { - "screenWidth": "{130,145}", - "scale": "2x", - "idiom": "watch" - }, - { - "screenWidth": "{146,165}", - "scale": "2x", - "idiom": "watch" - }, - { - "idiom": "mac" - }, - { - "scale": "1x", - "idiom": "mac" - }, - { - "scale": "2x", - "idiom": "mac" - } - ], - "info": { - "version": 1, - "author": "xcode" - } -} \ No newline at end of file diff --git a/iOS/Assets.xcassets/add.imageset/add.png b/iOS/Assets.xcassets/add.imageset/add.png deleted file mode 100644 index 0737b9dbc39fb68496d63318c4b1ac76ac2e30e6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 377 zcmV-<0fzpGP)Px$Gf6~2R7ef&R9zCmKnyP9omZ#e9PZ%;E`xLMs8`?;ymA5LYnz=U+wHbXnK3ex zCSQ`x&;B&a-bZVh>H#p676qgOdJ)b>L?RiC>|mWS$GQM#kcw(aI-sjmjol4wv`DoP zdZD&Y+gQ`4m6$g}+MJ%8^`(XKytqBN6Vk?d^mJqbHy@PbR!1t02Hr_(cRd=D`AiJi znhq3+*&sa%&4x<|Vp*c<8(O4-Eco1_rUzuZayY3yx7sKtu84NdEM1gpZLf-DHtC&;7sp-j=`+yM48bQjJ}U?Mxwyja$Pf Xm5f22zn~}s00000NkvXXu0mjfQ1+!_ diff --git a/iOS/Assets.xcassets/add.imageset/add@2x.png b/iOS/Assets.xcassets/add.imageset/add@2x.png deleted file mode 100644 index 0ed404c937913518f23ea642fd62b05ece2f9f31..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 749 zcmVPx%r%6OXRA>e5TFXtuFc4in4RAoTfCLhB05|SH4@lI2w6sAF+-LyKTtT7)5E2al zf_cl%%9&&)tI3^Bv^{;++N5u2)$|- zVtthx3*fi8LTVc5K&~DS z1B6koc4{PIt0y&}q(4hSU;BapYJ6I3YnE0`$dVbB#X**=38cC>$daaQN{r}~YszNy zLGG0kvV2D(jxB(fw@EalqwyY&;w2zl$#c}B z-U&E+(vc}MJol1mjDCyp1fXJSWNK<+7&VPC*;27%)0lOK94>8mTKuU3=iroF=0Hnw zF!LMH;^8j?l5JqJl(A#ca%#t7&Uqe;Lroi!GqAR`f|MFq!DJ^fReLN+8Vf3^JytN; zNlYzmk8yUey^#lqa+mNQ+K6GXRnz|c{ttm@KHlKyquAdsJUj~AXU8l@WN7do{so+j zHGx=;!Xq>s${*0RO;?JOvctJPx~b)kIJYX-&pC8N^XV;Pg1MRo15ENRWCG-r=}I{fxv9BRr!u#>Ug7{H7A1fi_^{nqfo27kPP f4L9o9KjQcX>mB=WE~e~300000NkvXXu0mjfGS^vO diff --git a/qController.Standard/.DS_Store b/qController.Standard/.DS_Store index ff126f00f78e86620d44fb207382884f7c82781e..8cc3233dc435ec91852e17342a8be5eb1f8716d3 100644 GIT binary patch delta 43 zcmZn(XbG6$&&azmU^hP_?`9r>7)CZDLmdSp%guR$Z`d}LO=O?gAhVfW;V(M?A^Q!f delta 70 zcmZn(XbG6$&&aniU^hP_-)0_x7{ { - UpdateSelected(); - UpdateLevels(); + Device.StartTimer(TimeSpan.FromSeconds(5.0), () => { + SendThump(); return active; }); } - public void UpdateSelected() + public void SendThump() { - string valuesForKeys = "[\"displayName\",\"number\",\"type\",\"isBroken\",\"isLoaded\",\"isPaused\",\"isRunning\",\"preWait\",\"duration\",\"postWait\",\"translationX\",\"translationY\",\"opacity\",\"scaleX\",\"scaleY\",\"uniqueID\",\"flagged\",\"listName\",\"colorName\",\"name\",\"armed\"]"; - //qController.qClient.sendAndReceiveStringArgs("/cue/selected/valuesForKeys", valuesForKeys); - } - public void UpdateLevels() - { - //qController.qClient.sendAndReceiveString("/cue/selected/levels"); + qController.qClient.sendStringUDP("/thump"); } public void Kill(){ diff --git a/qController.Standard/Pages/MasterPageItem.cs b/qController.Standard/Classes/Settings/MenuPageitem.cs similarity index 84% rename from qController.Standard/Pages/MasterPageItem.cs rename to qController.Standard/Classes/Settings/MenuPageitem.cs index 5a0e07e..15246a5 100644 --- a/qController.Standard/Pages/MasterPageItem.cs +++ b/qController.Standard/Classes/Settings/MenuPageitem.cs @@ -2,7 +2,7 @@ namespace qController { - public class MasterPageItem + public class MenuPageItem { public string Title { get; set; } public string Icon { get; set; } diff --git a/qController.Standard/Pages/MenuPage.xaml.cs b/qController.Standard/Pages/MenuPage.xaml.cs index 9d1a6f1..12a7fa7 100644 --- a/qController.Standard/Pages/MenuPage.xaml.cs +++ b/qController.Standard/Pages/MenuPage.xaml.cs @@ -9,26 +9,26 @@ namespace qController { public ListView listView; - public ObservableCollection items; + public ObservableCollection items; public MenuPage() { Title = "Menu"; InitializeComponent(); - items = new ObservableCollection(); + items = new ObservableCollection(); - items.Add(new MasterPageItem + items.Add(new MenuPageItem { Title = "Scan Network", Icon = "\uE800", Command = "scan" }); - items.Add(new MasterPageItem + items.Add(new MenuPageItem { Title = "Add Manually", Icon = "\uE801", Command = "add" }); - /*items.Add(new MasterPageItem + /*items.Add(new MenuPageItem { Title = "Open Link", Icon = "\uF0C9", @@ -73,7 +73,7 @@ namespace qController public void ChangeToWorkspace(QWorkSpace workspace) { items.Clear(); - items.Add(new MasterPageItem + items.Add(new MenuPageItem { Title = "Disconnect", Icon = "\uE803", @@ -81,7 +81,7 @@ namespace qController }); foreach (var cueList in workspace.data) { - items.Add(new MasterPageItem + items.Add(new MenuPageItem { Title = cueList.listName, Icon = "", @@ -101,7 +101,7 @@ namespace qController cueTitle = "\t" + cue.listName; } - items.Add(new MasterPageItem + items.Add(new MenuPageItem { Title = cueTitle, Icon = cueIcon, @@ -115,13 +115,13 @@ namespace qController public void ChangeToHome() { items.Clear(); - items.Add(new MasterPageItem + items.Add(new MenuPageItem { Title = "Scan Network", Icon = "\uE800", Command = "scan" }); - items.Add(new MasterPageItem + items.Add(new MenuPageItem { Title = "Add Manually", Icon = "\uE801", diff --git a/qController.Standard/Pages/RootPage.xaml.cs b/qController.Standard/Pages/RootPage.xaml.cs index 405ac3e..b716a08 100644 --- a/qController.Standard/Pages/RootPage.xaml.cs +++ b/qController.Standard/Pages/RootPage.xaml.cs @@ -39,7 +39,7 @@ namespace qController void OnItemSelected(object sender, SelectedItemChangedEventArgs e) { - var item = e.SelectedItem as MasterPageItem; + var item = e.SelectedItem as MenuPageItem; if (item != null) { MenuPage.listView.SelectedItem = null;