Merge pull request #152 from 96andrei/AndroidCustomData

baldwin628 · web-flow · commit ad7bf51752b6 · 2017-04-04T07:11:43.000-07:00
Fixed Custom Dimensions and Custom Metrics on Android.
diff --git a/source/Plugins/GoogleAnalyticsV4/GoogleAnalyticsAndroidV4.cs b/source/Plugins/GoogleAnalyticsV4/GoogleAnalyticsAndroidV4.cs
@@ -100,6 +100,17 @@ internal void LogEvent(EventHitBuilder builder) {
     eventBuilder.Call<AndroidJavaObject>("setAction", new object[] { builder.GetEventAction() });
     eventBuilder.Call<AndroidJavaObject>("setLabel", new object[] { builder.GetEventLabel() });
     eventBuilder.Call<AndroidJavaObject>("setValue", new object[] { builder.GetEventValue() });
+	
+	foreach(KeyValuePair<int, string> i in builder.GetCustomDimensions())
+    {
+        eventBuilder.Call<AndroidJavaObject>("setCustomDimension", new object[] { i.Key, i.Value });
+    }
+
+    foreach(KeyValuePair<int, float> i in builder.GetCustomMetrics())
+    {
+        eventBuilder.Call<AndroidJavaObject>("setCustomMetric", new object[] { i.Key, i.Value });
+    }
+	
     object[] builtEvent = new object[] { eventBuilder.Call<AndroidJavaObject>("build") };
     tracker.Call("send", builtEvent);
   }
diff --git a/source/Plugins/GoogleAnalyticsV4/GoogleAnalyticsMPV3.cs b/source/Plugins/GoogleAnalyticsV4/GoogleAnalyticsMPV3.cs
@@ -225,7 +225,7 @@ private string AddCustomVariables<T>(HitBuilder<T> builder) {
             WWW.EscapeURL(entry.Value.ToString());
       }
     }
-    foreach(KeyValuePair<int, string> entry in builder.GetCustomMetrics())
+    foreach(KeyValuePair<int, float> entry in builder.GetCustomMetrics())
     {
       if (entry.Value != null) {
         url += Fields.CUSTOM_METRIC.ToString() + entry.Key + "=" +
diff --git a/source/Plugins/GoogleAnalyticsV4/HitBuilders/HitBuilder.cs b/source/Plugins/GoogleAnalyticsV4/HitBuilders/HitBuilder.cs
@@ -28,7 +28,7 @@ public abstract class HitBuilder<T> {
 
   private Dictionary<int, string> customDimensions =
       new Dictionary<int,string>();
-  private Dictionary<int, string> customMetrics = new Dictionary<int,string>();
+  private Dictionary<int, float> customMetrics = new Dictionary<int,float>();
 
   private string campaignName = "";
   private string campaignSource = "";
@@ -51,12 +51,12 @@ public Dictionary<int, string> GetCustomDimensions() {
     return customDimensions;
   }
 
-  public T SetCustomMetric(int metricNumber, string value) {
+  public T SetCustomMetric(int metricNumber, float value) {
     customMetrics.Add(metricNumber, value);
     return GetThis();
   }
 
-  public Dictionary<int, string> GetCustomMetrics() {
+  public Dictionary<int, float> GetCustomMetrics() {
     return customMetrics;
   }
 

Original file line number	Diff line number	Diff line change
`@@ -225,7 +225,7 @@ private string AddCustomVariables<T>(HitBuilder<T> builder) {`
`225`	`225`	`WWW.EscapeURL(entry.Value.ToString());`
`226`	`226`	`}`
`227`	`227`	`}`
`228`		`- foreach(KeyValuePair<int, string> entry in builder.GetCustomMetrics())`
	`228`	`+ foreach(KeyValuePair<int, float> entry in builder.GetCustomMetrics())`
`229`	`229`	`{`
`230`	`230`	`if (entry.Value != null) {`
`231`	`231`	`url += Fields.CUSTOM_METRIC.ToString() + entry.Key + "=" +`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ public abstract class HitBuilder<T> {`
`28`	`28`
`29`	`29`	`private Dictionary<int, string> customDimensions =`
`30`	`30`	`new Dictionary<int,string>();`
`31`		`- private Dictionary<int, string> customMetrics = new Dictionary<int,string>();`
	`31`	`+ private Dictionary<int, float> customMetrics = new Dictionary<int,float>();`
`32`	`32`
`33`	`33`	`private string campaignName = "";`
`34`	`34`	`private string campaignSource = "";`
`@@ -51,12 +51,12 @@ public Dictionary<int, string> GetCustomDimensions() {`
`51`	`51`	`return customDimensions;`
`52`	`52`	`}`
`53`	`53`
`54`		`- public T SetCustomMetric(int metricNumber, string value) {`
	`54`	`+ public T SetCustomMetric(int metricNumber, float value) {`
`55`	`55`	`customMetrics.Add(metricNumber, value);`
`56`	`56`	`return GetThis();`
`57`	`57`	`}`
`58`	`58`
`59`		`- public Dictionary<int, string> GetCustomMetrics() {`
	`59`	`+ public Dictionary<int, float> GetCustomMetrics() {`
`60`	`60`	`return customMetrics;`
`61`	`61`	`}`
`62`	`62`