Merge branch 'develop' of https://hub.jazz.net/git/sanjayko/unity-sdk into develop

Author: Dogukan Erenel

Scripts/Logging/Logger.cs

@@ -132,7 +132,11 @@ public static void InstallDefaultReactors( int logHistory = 2 )
 #if UNITY_EDITOR || UNITY_IOS || UNITY_ANDROID
                 LogSystem.Instance.InstallReactor( new DebugReactor() );
 #endif
-                LogSystem.Instance.InstallReactor( new FileReactor( Application.persistentDataPath + "/" + Application.productName + ".log", LogLevel.STATUS, logHistory ) );
+
+                if (!string.IsNullOrEmpty(Constants.Path.LOG_FOLDER) && !System.IO.Directory.Exists(Application.persistentDataPath + Constants.Path.LOG_FOLDER ))
+                    System.IO.Directory.CreateDirectory(Application.persistentDataPath + Constants.Path.LOG_FOLDER );
+                
+                LogSystem.Instance.InstallReactor( new FileReactor( Application.persistentDataPath + Constants.Path.LOG_FOLDER + "/" + Application.productName + ".log", LogLevel.STATUS, logHistory ) );
 
                 Application.logMessageReceived += UnityLogCallback;
             }

Scripts/Services/Dialog/Dialog.cs

@@ -129,7 +129,7 @@ private void OnGetDialogsResp(RESTConnector.Request req, RESTConnector.Response
                 }
                 catch (Exception e)
                 {
-                    Log.Error("NLC", "GetDialogs Exception: {0}", e.ToString());
+                    Log.Error("Dialog", "GetDialogs Exception: {0}", e.ToString());
                     resp.Success = false;
                 }
             }
@@ -459,8 +459,22 @@ public CheckServiceStatus( Dialog service, ServiceStatus callback )
                 m_Service = service;
                 m_Callback = callback;
 
-                if (! m_Service.GetDialogs( OnGetDialogs ) )
-                    OnFailure( "Failed to invoke GetDialogs()." );
+                string customServiceID = Config.Instance.GetVariableValue(SERVICE_ID+"_ID");
+
+                //If custom classifierID is defined then we are using it to check the service health
+                if(!string.IsNullOrEmpty(customServiceID)){
+
+                    if (! m_Service.Converse( customServiceID, "Hello", OnDialog ) )
+                        OnFailure( "Failed to invoke Converse()." );
+                    else
+                        m_DialogCount += 1;
+                }
+                else{
+                    if (! m_Service.GetDialogs( OnGetDialogs ) )
+                        OnFailure( "Failed to invoke GetDialogs()." );
+                }
+
+               
             }
 
             private void OnGetDialogs( Dialogs dialogs )
@@ -496,7 +510,7 @@ private void OnDialog( ConverseResponse resp )
 
             private void OnFailure(string msg)
             {
-                Log.Error("NaturalLanguageClassifier", msg);
+                Log.Error("Dialog", msg);
                 m_Callback(SERVICE_ID, false);
                 m_DialogCount = 0;
             }

Scripts/Services/NaturalLanguageClassifier/NaturalLanguageClassifier.cs

@@ -512,8 +512,25 @@ public CheckServiceStatus( NaturalLanguageClassifier service, ServiceStatus call
                 m_Service = service;
                 m_Callback = callback;
 
-                if (! m_Service.GetClassifiers( OnCheckServices ) )
-                    OnFailure( "Failed to call GetClassifiers()" );
+                string customClassifierID = Config.Instance.GetVariableValue(SERVICE_ID+"_ID");
+                m_Service.DisableCache = true;
+                //If custom classifierID is defined then we are using it to check the service health
+                if(!string.IsNullOrEmpty(customClassifierID)){
+                    
+                    if (! m_Service.GetClassifier(customClassifierID, OnCheckService ) )
+                    {
+                        OnFailure( "Failed to call GetClassifier()" );
+                    }
+                    else
+                    {
+                        m_GetClassifierCount += 1;
+                    }
+                }
+                else{
+                    if (! m_Service.GetClassifiers( OnCheckServices ) )
+                        OnFailure( "Failed to call GetClassifiers()" );
+                }
+
             }
 
             private void OnCheckServices( Classifiers classifiers )

Scripts/Utilities/Constants.cs

@@ -220,6 +220,10 @@ public enum Event
 			/// Event fired when location with procurement information
 			/// </summary>
 			ON_QUESTION_PROCUREMENT,
+			/// <summary>
+			/// Event fired when location with procurement information
+			/// </summary>
+			ON_QUESTION_COMBINED_CALL,
             #endregion
 
             #region Animation / Camera
@@ -399,14 +403,21 @@ public enum Event
             /// 
             /// </summary>
             ON_COMMAND_PROCUREMENT,
+			/// <summary>
+			/// 
+			/// </summary>
+			ON_COMMAND_PROCUREMENT_LIST,
+			/// <summary>
+			/// 
+			/// </summary>
+			ON_COMMAND_ENTITY_EXTRACTION,
+			#endregion
 
-            #endregion
-
-            #region Input - Touch
-            /// <summary>
-            /// Event if there is touch on fullscreen pressed - It is called for each touch
-            /// </summary>
-            ON_TOUCH_PRESSED_FULLSCREEN = 500,
+			#region Input - Touch
+			/// <summary>
+			/// Event if there is touch on fullscreen pressed - It is called for each touch
+			/// </summary>
+			ON_TOUCH_PRESSED_FULLSCREEN = 500,
             /// <summary>
             /// Event if 
             /// </summary>
@@ -619,6 +630,16 @@ public static class Path
             /// Configuration file name.
             /// </summary>
             public const string CONFIG_FILE = "/Config.json";
+
+            /// <summary>
+            /// Cache folder to customize a parent folder for cache directory
+            /// </summary>
+            public static string CACHE_FOLDER = "";   //It needs to start with / 
+
+            /// <summary>
+            /// Log folder to customize a parent folder for logs
+            /// </summary>
+            public static string LOG_FOLDER = "";    //It needs to start with / 
         }
 
         /// <summary>

Scripts/Utilities/DataCache.cs

@@ -72,7 +72,7 @@ public void Initialize(string cacheName, long maxCacheSize, double maxCacheAge )
             m_MaxCacheSize = maxCacheSize;
             m_MaxCacheAge = maxCacheAge;
 
-            m_CachePath = Application.persistentDataPath + "/" + cacheName + "/";
+            m_CachePath = Application.persistentDataPath + Constants.Path.CACHE_FOLDER + "/" + cacheName + "/";
             if (!Directory.Exists(m_CachePath))
                 Directory.CreateDirectory(m_CachePath);
 

Scripts/Utilities/Utility.cs

@@ -150,7 +150,7 @@ public static GameObject FindObject(GameObject parent, string nameChild)
         /// <param name="nameChild">Name child.</param>
         /// <param name="isContains">Check string contains the name instead of equality.</param>
         /// <param name="sortByName">If true, children will be returned sorted by their name.</param>
-        public static T[] FindObjects<T>(GameObject parent, string nameChild, bool isContains = false, bool sortByName = false) where T : Component
+		public static T[] FindObjects<T>(GameObject parent, string nameChild, bool isContains = false, bool sortByName = false, bool includeInactive = true) where T : Component
         {
             T[] childObjects = null;
             List<T> listGameObject = new List<T>();
@@ -160,7 +160,7 @@ public static T[] FindObjects<T>(GameObject parent, string nameChild, bool isCon
             for (int i = 0; i < childPath.Length; i++)
             {
                 string childTransformName = childPath[i];
-                T[] childerenTransform = parent.GetComponentsInChildren<T>(includeInactive: true);
+				T[] childerenTransform = parent.GetComponentsInChildren<T>(includeInactive: includeInactive);
                 if (childerenTransform != null)
                 {
                     foreach (T item in childerenTransform)