add manual test for custom event

fix bug with tomap

Author: jinliu9508

OneSignalExample/Assets/OneSignal/Example/OneSignalExampleBehaviour.cs

@@ -124,6 +124,21 @@ public class OneSignalExampleBehaviour : MonoBehaviour
     /// <summary>
     ///
     /// </summary>
+    public string eventName;
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public string eventPropertyKey;
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public string eventPropertyValue;
+
+    /// <summary>
+    /// 
+    /// </summary>
     public string liveActivityId;
 
     /// <summary>
@@ -461,6 +476,21 @@ public void GetTags()
         _log($"Get all user tags " + dictionaryString.TrimEnd(',', ' ') + "}");
     }
 
+    public void TrackEvent() {
+        var properties = new Dictionary<string, object> {
+            { eventPropertyKey, eventPropertyValue },
+            { "timestamp", System.DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") },
+            { "platform", "Unity" }
+        };
+        _log($"Tracking event <b>{eventName}</b> with properties: {Json.Serialize(properties)}");
+        OneSignal.User.TrackEvent(eventName, properties);
+    }
+
+    public void TrackEventSimple() {
+        _log($"Tracking simple event <b>{eventName}</b> without properties");
+        OneSignal.User.TrackEvent(eventName);
+    }
+
     /*
      * Outcomes
      */
@@ -607,10 +637,13 @@ public void RemovePushToStartToken()
 
     public void SetLiveActivityTypeToken(string newVal) => liveActivityTypeToken = newVal;
 
-    private void Awake()
-    {
-        SDKDebug.LogIntercept += _log;
-        SDKDebug.WarnIntercept += _warn;
+    public void SetEventName(string newVal) => eventName = newVal;
+    public void SetEventPropertyKey(string newVal) => eventPropertyKey = newVal;
+    public void SetEventPropertyValue(string newVal) => eventPropertyValue = newVal;
+
+    private void Awake() {
+        SDKDebug.LogIntercept   += _log;
+        SDKDebug.WarnIntercept  += _warn;
         SDKDebug.ErrorIntercept += _error;
         appIdText.text = appId;
     }

com.onesignal.unity.android/Runtime/AndroidUserManager.cs

@@ -109,13 +109,8 @@ public void RemoveAliases(params string[] labels) =>
 
         public void RemoveSms(string sms) => _user.Call("removeSms", sms);
 
-        public void TrackEvent(string name, Dictionary<string, object> properties = null)
-        {
-            if (properties != null)
-                _user.Call("trackEvent", name, properties.ToMap());
-            else
-                _user.Call("trackEvent", name);
-        }
+        public void TrackEvent(string name, Dictionary<string, object> properties = null) =>
+            _user.Call("trackEvent", name, properties?.ToMap());
 
         public void Initialize()
         {

com.onesignal.unity.android/Runtime/Utilities/AndroidJavaObjectExtensions.cs

@@ -135,6 +135,9 @@ public static AndroidJavaObject ToMap(this Dictionary<string, string> source)
 
         public static AndroidJavaObject ToMap(this Dictionary<string, object> source)
         {
+            if (source == null)
+                return null;
+
             var map = new AndroidJavaObject("java.util.HashMap");
             var put = AndroidJNIHelper.GetMethodID(
                 map.GetRawClass(),
@@ -145,18 +148,55 @@ public static AndroidJavaObject ToMap(this Dictionary<string, object> source)
             var entryArgs = new object[2];
             foreach (var kv in source)
             {
-                var key = new AndroidJavaObject("java.lang.String", kv.Key);
-                var value = new AndroidJavaClass("java.lang.String").CallStatic<string>(
-                    "valueOf",
-                    kv.Value
-                );
-                entryArgs[0] = key;
-                entryArgs[1] = value;
-                AndroidJNI.CallObjectMethod(
-                    map.GetRawObject(),
-                    put,
-                    AndroidJNIHelper.CreateJNIArgArray(entryArgs)
-                );
+                using (var key = new AndroidJavaObject("java.lang.String", kv.Key))
+                {
+                    AndroidJavaObject value = null;
+
+                    // Preserve original data types
+                    switch (kv.Value)
+                    {
+                        case string stringValue:
+                            value = new AndroidJavaObject("java.lang.String", stringValue);
+                            break;
+                        case int intValue:
+                            value = new AndroidJavaObject("java.lang.Integer", intValue);
+                            break;
+                        case long longValue:
+                            value = new AndroidJavaObject("java.lang.Long", longValue);
+                            break;
+                        case float floatValue:
+                            value = new AndroidJavaObject("java.lang.Float", floatValue);
+                            break;
+                        case double doubleValue:
+                            value = new AndroidJavaObject("java.lang.Double", doubleValue);
+                            break;
+                        case bool boolValue:
+                            value = new AndroidJavaObject("java.lang.Boolean", boolValue);
+                            break;
+                        case null:
+                            value = null;
+                            break;
+                        default:
+                            // Fallback to string representation for unsupported types
+                            value = new AndroidJavaObject("java.lang.String", kv.Value.ToString());
+                            break;
+                    }
+
+                    try
+                    {
+                        entryArgs[0] = key;
+                        entryArgs[1] = value;
+                        AndroidJNI.CallObjectMethod(
+                            map.GetRawObject(),
+                            put,
+                            AndroidJNIHelper.CreateJNIArgArray(entryArgs)
+                        );
+                    }
+                    finally
+                    {
+                        value?.Dispose();
+                    }
+                }
             }
 
             return map;