Merge pull request #241 from Kapim/devel

Changed:
robofit · May 31, 2022 · 55df2aa · 55df2aa
2 parents 274d8b0 + f87c9f4
commit 55df2aa
Show file tree

Hide file tree

Showing 7 changed files with 1,393 additions and 290 deletions.
diff --git a/arcor2_AREditor/Assets/BASE/Scripts/GameManager.cs b/arcor2_AREditor/Assets/BASE/Scripts/GameManager.cs
@@ -201,7 +201,7 @@ public class GameManager : Singleton<GameManager> {
         /// <summary>
         /// Api version
         /// </summary>        
-        public const string ApiVersion = "0.19.0";
+        public const string ApiVersion = "0.20.0";
         /// <summary>
         /// List of projects metadata
         /// </summary>

diff --git a/arcor2_AREditor/Assets/BASE/Scripts/Swagger/IO.Swagger.dll b/arcor2_AREditor/Assets/BASE/Scripts/Swagger/IO.Swagger.dll
diff --git a/arcor2_AREditor/Assets/BASE/Scripts/Swagger/IO.Swagger.xml b/arcor2_AREditor/Assets/BASE/Scripts/Swagger/IO.Swagger.xml
diff --git a/arcor2_AREditor/Assets/BASE/Scripts/WebsocketManager.cs b/arcor2_AREditor/Assets/BASE/Scripts/WebsocketManager.cs
@@ -22,6 +22,8 @@ public class WebsocketManager : Singleton<WebsocketManager> {
         /// Websocket context
         /// </summary>
         private WebSocket websocket;
+
+        int counter = 0;
         /// <summary>
         /// Dictionary of unprocessed responses
         /// </summary>
@@ -579,30 +581,37 @@ private void HandleStateBefore(string obj) {
             try {
 
                 IO.Swagger.Model.ActionStateBefore actionStateBefore = JsonConvert.DeserializeObject<IO.Swagger.Model.ActionStateBefore>(obj);
+                if (!string.IsNullOrEmpty(actionStateBefore.Data.ActionId)) {
+                    puck_id = actionStateBefore.Data.ActionId;
 
-                puck_id = actionStateBefore.Data.ActionId;
-
-                if (!ProjectManager.Instance.Valid) {
-                    Debug.LogWarning("Project not yet loaded, ignoring current action");
-                    GameManager.Instance.ActionRunningOnStartupId = puck_id;
-                    return;
+                    if (!ProjectManager.Instance.Valid) {
+                        Debug.LogWarning("Project not yet loaded, ignoring current action");
+                        GameManager.Instance.ActionRunningOnStartupId = puck_id;
+                        return;
+                    }
+                    // Stop previously running action (change its color to default)
+                    if (ActionsManager.Instance.CurrentlyRunningAction != null)
+                        ActionsManager.Instance.CurrentlyRunningAction.StopAction();
+
+                    Action puck = ProjectManager.Instance.GetAction(puck_id);
+                    ActionsManager.Instance.CurrentlyRunningAction = puck;
+                    // Run current action (set its color to running)
+                    puck.RunAction();
+                } else {
+                    if (ActionsManager.Instance.CurrentlyRunningAction != null)
+                        ActionsManager.Instance.CurrentlyRunningAction.StopAction();
+                    ActionsManager.Instance.CurrentlyRunningAction = null;
                 }
+
+
 
             } catch (NullReferenceException e) {
                 Debug.Log("Parse error in HandleCurrentAction()");
                 return;
+            } catch (ItemNotFoundException e) {
+                Debug.LogError(e);
             }
-            // Stop previously running action (change its color to default)
-            if (ActionsManager.Instance.CurrentlyRunningAction != null)
-                ActionsManager.Instance.CurrentlyRunningAction.StopAction();
-            try {
-                Action puck = ProjectManager.Instance.GetAction(puck_id);
-                ActionsManager.Instance.CurrentlyRunningAction = puck;
-                // Run current action (set its color to running)
-                puck.RunAction();
-            } catch (ItemNotFoundException ex) {
-                Debug.LogError(ex);
-            }
+
         }
 
         private void HandleActionStateAfter(string obj) {
@@ -613,11 +622,10 @@ private void HandleActionStateAfter(string obj) {
             try {
 
                 IO.Swagger.Model.ActionStateAfter actionStateBefore = JsonConvert.DeserializeObject<IO.Swagger.Model.ActionStateAfter>(obj);
-
-                puck_id = actionStateBefore.Data.ActionId;
-
-
-
+                if (ActionsManager.Instance.CurrentlyRunningAction != null)
+                        ActionsManager.Instance.CurrentlyRunningAction.StopAction();
+                    ActionsManager.Instance.CurrentlyRunningAction = null;
+
             } catch (NullReferenceException e) {
                 Debug.Log("Parse error in HandleCurrentAction()");
                 return;