Merge pull request #22 from dsarfati/1.2.0

Updated iOS and Android SDKs

.travis.yml

@@ -5,7 +5,7 @@ sudo: required
 env:
   global:
     - Android_SDK="v1.1.0"
-    - iOS_SDK="v1.1.0"
+    - iOS_SDK="v1.2.0"
 branches:
   only:
   - master

Assets/Zapic/Editor/ZapicDependencies.xml

@@ -1,16 +1,5 @@
 <dependencies>
   <androidPackages>
-    <androidPackage spec="com.android.support:cardview-v7:27.1.0" />
-    <androidPackage spec="com.android.support:support-fragment:27.1.0" />
-    <androidPackage spec="com.google.android.gms:play-services-auth:11.8.0">
-      <androidSdkPackageIds>
-        <androidSdkPackageId>extra-google-m2repository</androidSdkPackageId>
-      </androidSdkPackageIds>
-    </androidPackage>
-    <androidPackage spec="com.google.android.gms:play-services-games:11.8.0">
-      <androidSdkPackageIds>
-        <androidSdkPackageId>extra-google-m2repository</androidSdkPackageId>
-      </androidSdkPackageIds>
-    </androidPackage>
+    <androidPackage spec="com.android.support:support-core-utils:[26.0.0, 27.2.0)" />
   </androidPackages>
 </dependencies>

Assets/Zapic/Examples/ZapicButton.cs

@@ -20,6 +20,11 @@ private void Awake()
 
     private void ShowZapicMenu()
     {
-        Zapic.Show(ZapicSDK.Views.Main);
+        Zapic.ShowDefaultPage();
+    }
+
+    private void ShowZapicChallengesMenu()
+    {
+        Zapic.ShowPage(ZapicPages.Challenges);
     }
 }

Assets/Zapic/Examples/ZapicExample.cs

@@ -0,0 +1,78 @@
+using System.Collections.Generic;
+using UnityEngine;
+
+public class ZapicExample : MonoBehaviour
+{
+    void Start()
+    {
+        Zapic.OnLogin = ((player) =>
+        {
+            Debug.LogFormat("Player logged in. Id:{0}, Notification:{1}", player.PlayerId, player.NotificationToken);
+        });
+
+        Zapic.OnLogout = ((player) =>
+        {
+            Debug.LogFormat("Player logged out. Id:{0}, Notification:{1}", player.PlayerId, player.NotificationToken);
+        });
+
+        Zapic.Start();
+    }
+
+    private void Update()
+    {
+        //Simulate a Zapic event on left click
+        if (Input.GetMouseButtonDown(0))
+        {
+            SendEvent();
+        }
+        //Simulate HandleInteraction on right click
+        else if(Input.GetMouseButtonDown(1))
+        {
+            HandleInteraction();
+        }
+        //Simulate getting current player on space bar
+        else if(Input.GetKeyDown(KeyCode.Space))
+        {
+            GetPlayer();
+        }
+    }
+
+    private void SendEvent()
+    {
+        var eventParams = new Dictionary<string, object>();
+
+        //Add parameter information to the event
+        eventParams.Add("Score",22);
+        eventParams.Add("PARAM2","abc");
+        eventParams.Add("PARAM3",true);
+        eventParams.Add("PARAM4","\"blab");
+        eventParams.Add("PAR\"AM5", "\"blab" );
+
+        //Sumbit the event to the Zapic server
+        Zapic.SubmitEvent(eventParams);
+    }
+
+    private void GetPlayer()
+    {
+        //Gets the current player
+        var player = Zapic.Player();
+
+        if (player == null)
+        {
+            Debug.Log("Player is null");
+        }
+        else
+        {
+            Debug.LogFormat("Current Player, Id:{0}, NotificationToken:{1}", player.PlayerId, player.NotificationToken);
+        }
+    }
+
+    private void HandleInteraction()
+    {
+        var data = new Dictionary<string, object>()
+            { { "zapic", "/challenge/00000000-0000-0000-0000-000000000000" }
+            };
+
+        Zapic.HandleInteraction(data);
+    }
+}

Assets/Zapic/IZapicInterface.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 
 namespace ZapicSDK
@@ -28,10 +28,15 @@ internal interface IZapicInterface
         void Start();
 
         /// <summary>
-        /// Shows the given zapic window
+        /// Shows the default Zapic page
         /// </summary>
-        /// <param name="view">View to show.</param>
-        void Show(Views view);
+        void ShowDefaultPage();
+
+         /// <summary>
+        /// Shows the given Zapic page
+        /// </summary>
+        /// <param name="page">Page to show.</param>
+        void ShowPage(ZapicPages page);
 
         /// <summary>
         /// Gets the current players unique id.
@@ -43,7 +48,7 @@ internal interface IZapicInterface
         /// Handle Zapic data. Usually from an integration like push notifications.
         /// </summary>
         /// <param name="data">The data.</param>
-        void HandleData(Dictionary<string, object> data);
+        void HandleInteraction(Dictionary<string, object> data);
 
         /// <summary>
         /// Submit a new in-game event to zapic.

Assets/Zapic/MiniJSON.cs

@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) 2013 Calvin Rien
  *
  * Based on the JSON parser by Patrick van Bergen
@@ -629,4 +629,4 @@ void SerializeOther(object value)
             }
         }
     }
-}
+}