better logic, plus added delay after connection success.

Author: StephenHodgson

Assets/HoloToolkit/Sharing/Prefabs/ManualIpConfigUtility.prefab

@@ -958,7 +958,10 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   SphereRadius: 0.1
   MoveSpeed: 2
+  useUnscaledTime: 1
   hideOnStart: 0
+  debugDisplaySphere: 0
+  debugDisplayTargetPosition: 0
 --- !u!114 &114203344055936422
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -1003,7 +1006,8 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 1dc603e0d201da746b38b8ce2e4ae7a6, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  HideWhenConnected: 0
+  HideWhenConnected: 1
+  HideAfterSeconds: 1
   Timeout: 5
   ipAddress: {fileID: 114104649135736844}
   connectionIndicator: {fileID: 114366805303276948}

Assets/HoloToolkit/Sharing/Scripts/Utilities/ManualIpConfiguration.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections;
 using UnityEngine;
 using UnityEngine.UI;
 
@@ -17,9 +18,17 @@ public class ManualIpConfiguration : MonoBehaviour
         [Tooltip("Hides the UI when connection is made.")]
         public bool HideWhenConnected;
 
+        /// <summary>
+        /// Hides the UI after this many seconds.
+        /// </summary>
+        [Range(0.1f, 5f)]
+        [Tooltip("Hides the UI after this many seconds.")]
+        public float HideAfterSeconds = 1f;
+
         /// <summary>
         /// How many seconds before server connection times out.
         /// </summary>
+        [Range(1, 30)]
         [Tooltip("How many seconds before server connection times out.")]
         public int Timeout = 5;
 
@@ -35,34 +44,55 @@ public class ManualIpConfiguration : MonoBehaviour
 
         private bool isTryingToConnect;
 
+        private bool firstRun;
+
         private void Awake()
         {
             ipAddress.text = PlayerPrefs.GetString("SharingServerIp", "Not Connected");
+            firstRun = true;
         }
 
-        private void OnEnable()
+        private void Start()
         {
             if (SharingStage.Instance != null)
             {
                 SharingStage.Instance.SharingManagerConnected += OnConnected;
                 SharingStage.Instance.SharingManagerDisconnected += OnDisconnected;
             }
+            else
+            {
+                Debug.LogError("Unable to subscribe to Sharing Stage!");
+            }
+        }
 
-            ConnectToSharingService();
+        private void OnEnable()
+        {
+            if (!firstRun)
+            {
+                isTryingToConnect = true;
+                ConnectToSharingService();
+            }
+            else
+            {
+                firstRun = false;
+            }
         }
 
         private void Update()
         {
             if (timerRunning && timer - Time.time < 0)
             {
-                isTryingToConnect = false;
-                OnDisconnected();
+                if (isTryingToConnect)
+                {
+                    isTryingToConnect = false;
+                    OnDisconnected();
 
-                PlayerPrefs.SetString("SharingServerIp", "Not Connected");
+                    PlayerPrefs.SetString("SharingServerIp", "Not Connected");
+                }
             }
         }
 
-        private void OnDisable()
+        private void OnDestroy()
         {
             if (SharingStage.Instance != null)
             {
@@ -89,16 +119,17 @@ private void CheckConnection()
         private void OnConnected(object sender = null, EventArgs e = null)
         {
             timerRunning = false;
-            isTryingToConnect = false;
             connectionIndicator.color = Color.green;
             ipAddress.text = SharingStage.Instance.Connection.GetRemoteAddress().ToString();
 
             PlayerPrefs.SetString("SharingServerIp", ipAddress.text);
 
-            if (HideWhenConnected)
+            if (HideWhenConnected && isTryingToConnect)
             {
-                gameObject.SetActive(false);
+                StartCoroutine(Hide());
             }
+
+            isTryingToConnect = false;
         }
 
         private void OnDisconnected(object sender = null, EventArgs e = null)
@@ -114,6 +145,9 @@ private void OnDisconnected(object sender = null, EventArgs e = null)
 
         public void InputString(string intput)
         {
+            timerRunning = false;
+            isTryingToConnect = false;
+
             if (ipAddress.text.Contains("Connected") || ipAddress.text.Contains("127.0.0.1"))
             {
                 ipAddress.text = string.Empty;
@@ -127,6 +161,9 @@ public void InputString(string intput)
 
         public void DeleteLastCharacter()
         {
+            timerRunning = false;
+            isTryingToConnect = false;
+
             if (!string.IsNullOrEmpty(ipAddress.text))
             {
                 ipAddress.text = ipAddress.text.Substring(0, ipAddress.text.Length - 1);
@@ -135,11 +172,17 @@ public void DeleteLastCharacter()
 
         public void ClearIpAddressString()
         {
+            timerRunning = false;
+            isTryingToConnect = false;
+
             ipAddress.text = "";
         }
 
         public void ConnectToSharingService()
         {
+            timerRunning = false;
+            isTryingToConnect = false;
+
             if (ipAddress.text.Contains("Connected"))
             {
                 OnDisconnected();
@@ -151,5 +194,12 @@ public void ConnectToSharingService()
             SharingStage.Instance.ConnectToServer(ipAddress.text, SharingStage.Instance.ServerPort);
             CheckConnection();
         }
+
+        private IEnumerator Hide()
+        {
+            yield return new WaitForSeconds(HideAfterSeconds);
+
+            gameObject.SetActive(false);
+        }
     }
 }