From 091e81c95533b633e2130d5b03f76bb22f8d2900 Mon Sep 17 00:00:00 2001 From: Dimitrie Stefanescu Date: Tue, 24 Sep 2019 13:10:28 +0100 Subject: [PATCH] bumps core and popup, adds telemetry logs --- .gitmodules | 3 --- SpeckleElements | 1 - SpeckleRevitReboot/Entry.cs | 3 ++- SpeckleRevitReboot/SpeckleRevit.csproj | 27 ++++++++++++++++++++++---- SpeckleRevitReboot/UI/Receiver.cs | 1 + SpeckleRevitReboot/UI/Sender.cs | 5 +++++ SpeckleRevitReboot/app.config | 4 ++++ SpeckleRevitReboot/packages.config | 9 +++++++-- 8 files changed, 42 insertions(+), 11 deletions(-) delete mode 160000 SpeckleElements diff --git a/.gitmodules b/.gitmodules index b862947..e69de29 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +0,0 @@ -[submodule "SpeckleElements"] - path = SpeckleElements - url = https://github.com/speckleworks/SpeckleElements.git diff --git a/SpeckleElements b/SpeckleElements deleted file mode 160000 index b5d162c..0000000 --- a/SpeckleElements +++ /dev/null @@ -1 +0,0 @@ -Subproject commit b5d162cb60940bf1fafe715cd0e9e45741b7ae15 diff --git a/SpeckleRevitReboot/Entry.cs b/SpeckleRevitReboot/Entry.cs index 6f95cb1..611192b 100644 --- a/SpeckleRevitReboot/Entry.cs +++ b/SpeckleRevitReboot/Entry.cs @@ -85,7 +85,8 @@ public Result Execute( ExternalCommandData commandData, ref string message, Elem // Initialise the window #if DEBUG - SpeckleWindow = new SpeckleUiWindow( bindings, @"http://localhost:8080/" ); + //SpeckleWindow = new SpeckleUiWindow( bindings, @"http://localhost:8080/" ); + SpeckleWindow = new SpeckleUiWindow( bindings, @"https://matteo-dev.appui.speckle.systems/#/" ); #else SpeckleWindow = new SpeckleUiWindow( bindings, @"https://matteo-dev.appui.speckle.systems/#/" ); // On release, default to the latest ci-ed version from https://appui.speckle.systems #endif diff --git a/SpeckleRevitReboot/SpeckleRevit.csproj b/SpeckleRevitReboot/SpeckleRevit.csproj index 93a281a..06cd7e7 100644 --- a/SpeckleRevitReboot/SpeckleRevit.csproj +++ b/SpeckleRevitReboot/SpeckleRevit.csproj @@ -80,6 +80,21 @@ MinimumRecommendedRules.ruleset + + ..\packages\Countly.19.8.0\lib\net40-client\Countly.dll + + + ..\packages\DeviceId.4.3.0\lib\net40\DeviceId.dll + + + ..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.dll + + + ..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.dll + + + ..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.Desktop.dll + ..\packages\Newtonsoft.Json.12.0.2\lib\net45\Newtonsoft.Json.dll @@ -93,11 +108,11 @@ ..\packages\Revit.RevitApiUI.x64.2019.0.0\lib\net45\RevitAPIUI.dll False - - ..\packages\SpeckleCore.1.6.8\lib\net45\SpeckleCore.dll + + ..\packages\SpeckleCore.1.6.9\lib\net45\SpeckleCore.dll - - ..\packages\SpecklePopup.1.6.11\lib\net45\SpecklePopup.dll + + ..\packages\SpecklePopup.1.6.12\lib\net45\SpecklePopup.dll ..\packages\SpeckleUiBase.1.1.1-wip\lib\net452\SpeckleUiBase.dll @@ -119,6 +134,8 @@ + + @@ -206,8 +223,10 @@ + + \ No newline at end of file diff --git a/SpeckleRevitReboot/UI/Receiver.cs b/SpeckleRevitReboot/UI/Receiver.cs index c15f6c6..ab03905 100644 --- a/SpeckleRevitReboot/UI/Receiver.cs +++ b/SpeckleRevitReboot/UI/Receiver.cs @@ -22,6 +22,7 @@ public override void BakeReceiver( string args ) { var client = JsonConvert.DeserializeObject( args ); var apiClient = new SpeckleApiClient( (string) client.account.RestApi ) { AuthToken = (string) client.account.Token }; + apiClient.ClientType = "Revit"; NotifyUi( "update-client", JsonConvert.SerializeObject( new { diff --git a/SpeckleRevitReboot/UI/Sender.cs b/SpeckleRevitReboot/UI/Sender.cs index 4be3256..664cd46 100644 --- a/SpeckleRevitReboot/UI/Sender.cs +++ b/SpeckleRevitReboot/UI/Sender.cs @@ -48,6 +48,8 @@ public override void AddSender(string args) ISelectionFilter filter = JsonConvert.DeserializeObject(JsonConvert.SerializeObject(client.filter), GetFilterType(client.filter.Type.ToString())); GetSelectionFilterObjects(filter, client._id.ToString(), client.streamId.ToString()); + + SpeckleTelemetry.RecordStreamCreated( "Revit" ); } public override void UpdateSender(string args) @@ -73,6 +75,8 @@ public override void UpdateSender(string args) ISelectionFilter filter = JsonConvert.DeserializeObject(JsonConvert.SerializeObject(client.filter), GetFilterType(client.filter.Type.ToString())); GetSelectionFilterObjects(filter, client._id.ToString(), client.streamId.ToString()); + + SpeckleTelemetry.RecordStreamUpdated( "Revit" ); } // NOTE: This is actually triggered when clicking "Push!" @@ -204,6 +208,7 @@ public override void PushSender( string args ) errors } ) ); + SpeckleTelemetry.RecordStreamUpdated( "Revit" ); } /// diff --git a/SpeckleRevitReboot/app.config b/SpeckleRevitReboot/app.config index edb2964..e539103 100644 --- a/SpeckleRevitReboot/app.config +++ b/SpeckleRevitReboot/app.config @@ -6,6 +6,10 @@ + + + + \ No newline at end of file diff --git a/SpeckleRevitReboot/packages.config b/SpeckleRevitReboot/packages.config index d86978a..ee5aa0b 100644 --- a/SpeckleRevitReboot/packages.config +++ b/SpeckleRevitReboot/packages.config @@ -4,11 +4,16 @@ + + + + + - - + +