Merge pull request #15 from adjust/development

New response data fields

Author: nonelse

Adjust_v3.2.3.unitypackage

@@ -10,11 +10,11 @@ public class Adjust : MonoBehaviour {
 	private static Action<ResponseData> responseDelegate = null;
 
 	public string appToken = "{Your App Token}";
-	public Util.LogLevel logLevel = Util.LogLevel.Info;
-	public Util.Environment environment = Util.Environment.Sandbox;
+	public AdjustUtil.LogLevel logLevel = AdjustUtil.LogLevel.Info;
+	public AdjustUtil.AdjustEnvironment environment = AdjustUtil.AdjustEnvironment.Sandbox;
 	public bool eventBuffering = false;
 	public bool startManually = false;
-	public const string sdkPrefix = "unity3.2.3";
+	public const string sdkPrefix = "unity3.3.0";
 
 	void Awake() {
 		if (!this.startManually) {
@@ -34,7 +34,7 @@ void OnApplicationPause(bool pauseStatus) {
 		}
 	}
 
-	public static void appDidLaunch(string appToken, Util.Environment environment, Util.LogLevel logLevel, bool eventBuffering) {
+	public static void appDidLaunch(string appToken, AdjustUtil.AdjustEnvironment environment, AdjustUtil.LogLevel logLevel, bool eventBuffering) {
 		if (Adjust.instance != null) {
 			Debug.Log("adjust: warning, SDK already started. Restarting");
 		}

Adjust_v3.3.0.unitypackage

@@ -82,15 +82,15 @@ static int RunPostBuildScript (bool preBuild, string pathToBuiltProject = "") {
 
 		#if UNITY_ANDROID
 		pathToScript = "/Editor/AdjustPostBuildAndroid";
-		arguments = Application.dataPath;
+		arguments = "\"" + Application.dataPath + "\"";
 		if (preBuild)
 			arguments = "--pre-build " + arguments;
 		#elif UNITY_IOS
 		pathToScript = "/Editor/AdjustPostBuildiOS";
 		if (AdjustEditor.iOSBuildPath == "") {
-			arguments = pathToBuiltProject;
+			arguments = "\"" + pathToBuiltProject + "\"";
 		} else {
-			arguments = AdjustEditor.iOSBuildPath;
+			arguments = "\"" + AdjustEditor.iOSBuildPath + "\"";
 		}
 		#else
 		return -1;
@@ -121,7 +121,7 @@ static string GenerateErrorScriptMessage(int exitCode) {
 			#if UNITY_ANDROID
 			logFile = projectPath + "/AdjustPostBuildAndroidLog.txt";
 			#elif UNITY_IOS
-			logFile = projectPath + "/AdjustPostBuiliOSLog.txt";
+			logFile = projectPath + "/AdjustPostBuildiOSLog.txt";
 			#else
 			return null;
 			#endif

Assets/Adjust.cs

@@ -18,13 +18,14 @@ def main():
         # path of the Xcode SDK on the system
         xcode_sdk_path = get_xcode_sdk_path(LogFunc)
 
-        # path for unity iOS Xcode project and adFramework on the system
-        unity_xcode_project_path, adFramework_path = get_paths(LogFunc, parser, xcode_sdk_path)
+        # path for unity iOS Xcode project and framework on the system
+        unity_xcode_project_path, framework_path = get_paths(LogFunc, parser, xcode_sdk_path)
 
         # edit the Xcode project using mod_pbxproj
-        #  add the adFramework library
+        #  add the adSupport framework library
+        #  add the iAd framework library
         #  change the compilation flags of the adjust project files to support non-ARC
-        edit_unity_xcode_project(LogFunc, unity_xcode_project_path, adFramework_path)
+        edit_unity_xcode_project(LogFunc, unity_xcode_project_path, framework_path)
 
         # change the Xcode project directly
         #  allow objective-c exceptions
@@ -43,20 +44,24 @@ def get_paths(Log, parser, xcode_sdk_path):
 
     unity_xcode_project_path = ios_project_path + "/Unity-iPhone.xcodeproj/project.pbxproj"
     Log("Unity3d Xcode project path: {0}", unity_xcode_project_path)
-    
-    adFramework_path = xcode_sdk_path + "/System/Library/Frameworks/AdSupport.framework"
-    Log("adFramework path: {0}", adFramework_path)
 
-    return unity_xcode_project_path, adFramework_path
+    framework_path = xcode_sdk_path + "/System/Library/Frameworks/"
+    Log("framework path: {0}", framework_path)
+
+    return unity_xcode_project_path, framework_path
 
-def edit_unity_xcode_project(Log, unity_xcode_project_path, adFramework_path):
+def edit_unity_xcode_project(Log, unity_xcode_project_path, framework_path):
     # load unity iOS pbxproj project file
     unity_XcodeProject = XcodeProject.Load(unity_xcode_project_path)
 
-    # add adFramework to unity
-    unity_XcodeProject.add_file_if_doesnt_exist(adFramework_path, tree="SDKROOT", create_build_files=True,weak=True)
+    # add adSupport framework to unity
+    unity_XcodeProject.add_file_if_doesnt_exist(framework_path + "AdSupport.framework", tree="SDKROOT", create_build_files=True,weak=True)
     Log("added adSupport framework")
 
+    # add iAd framework to unity
+    unity_XcodeProject.add_file_if_doesnt_exist(framework_path + "iAd.framework", tree="SDKROOT", create_build_files=True,weak=True)
+    Log("added iAd framework")
+
     # regex for adjust sdk files
     re_adjust_files = re.compile(r"AI.*\.m|.*\+AI.*\.m|Adjust\.m|AdjustUnity\.mm")
 

Assets/Editor/AdjustEditor.cs

@@ -11,7 +11,7 @@ public class ExampleGUI : MonoBehaviour {
 	void OnGUI () {
 		if (GUI.Button (new Rect (0, Screen.height * 0 / nr_buttons, Screen.width, Screen.height / nr_buttons),
 		                "manual launch")) {
-			Adjust.appDidLaunch("querty123456", Util.Environment.Sandbox, Util.LogLevel.Verbose, false);
+			Adjust.appDidLaunch("querty123456", AdjustUtil.AdjustEnvironment.Sandbox, AdjustUtil.LogLevel.Verbose, false);
 			isEnabled = true;
 		}
 
@@ -52,9 +52,27 @@ void OnGUI () {
 
 	public void responseDelegate (ResponseData responseData)
 	{
-		Debug.Log ("activitykind " + responseData.activityKind.ToString ());
-		Debug.Log ("trackerName " + responseData.trackerName);
-		Debug.Log ("error " + responseData.error);
+
+		Debug.Log ("Was success? " + responseData.success);
+		Debug.Log ("Will retry? " + responseData.willRetry);
+
+		if (!string.IsNullOrEmpty (responseData.activityKindString))
+			Debug.Log ("activityKind " + responseData.activityKindString);
+		if (responseData.trackerName != null)
+			Debug.Log ("trackerName " + responseData.trackerName);
+		if (responseData.trackerToken != null)
+			Debug.Log ("trackerToken " + responseData.trackerToken);
+		if (responseData.network != null)
+			Debug.Log ("network " + responseData.network);
+		if (responseData.campaign != null)
+			Debug.Log ("campaign " + responseData.campaign);
+		if (responseData.adgroup != null)
+			Debug.Log ("adgroup " + responseData.adgroup);
+		if (responseData.creative != null)
+			Debug.Log ("creative " + responseData.creative);
+		if (responseData.error != null)
+			Debug.Log ("error " + responseData.error);
+
 	}
 
 }

Assets/Editor/AdjustPostBuildiOS

@@ -1,5 +1,5 @@
 namespace com.adjust.sdk {
-	public class Util {
+	public class AdjustUtil {
 		public enum LogLevel {
 			Verbose = 1,
 			Debug,
@@ -9,7 +9,7 @@ public enum LogLevel {
 			Assert
 		}
 
-		public enum Environment {
+		public enum AdjustEnvironment {
 			Sandbox,
 			Production
 		}

Assets/ExampleGUI/ExampleGUI.cs

@@ -18,7 +18,7 @@ public AdjustAndroid() {
 			ajoCurrentActivity = ajcUnityPlayer.GetStatic<AndroidJavaObject>("currentActivity");
 		}
 
-		public void appDidLaunch(string appToken, Util.Environment environment, string sdkPrefix, Util.LogLevel logLevel, bool eventBuffering) {
+		public void appDidLaunch(string appToken, AdjustUtil.AdjustEnvironment environment, string sdkPrefix, AdjustUtil.LogLevel logLevel, bool eventBuffering) {
 
 			string sEnvironment = environment.ToString ().ToLower ();
 			string sLogLevel = logLevel.ToString ().ToLower ();