From 9e847cb6589909bca24c71b6a496ec4c2027633d Mon Sep 17 00:00:00 2001 From: Patrick Kitchens Date: Thu, 26 Apr 2018 10:59:14 -0500 Subject: [PATCH] ok --- .../Scripts/CustomAndroidPlugin.cs.meta | 5 ++++ MoCha/Assets/Scripts/FitBitAPI.cs | 26 ++++-------------- MoCha/Assets/Scripts/FitBitAPI.cs.meta | 5 ++++ MoCha/Assets/Scripts/FitbitCaller.cs.meta | 5 ++++ MoCha/Assets/Scripts/FitbitData.cs.meta | 5 ++++ MoCha/Assets/Scripts/JSONObject.cs.meta | 5 ++++ .../Assets/Scripts/OAuth2AccessToken.cs.meta | 5 ++++ MoCha/UpgradeLog.htm | Bin 0 -> 33450 bytes 8 files changed, 36 insertions(+), 20 deletions(-) create mode 100644 MoCha/UpgradeLog.htm diff --git a/MoCha/Assets/Scripts/CustomAndroidPlugin.cs.meta b/MoCha/Assets/Scripts/CustomAndroidPlugin.cs.meta index a23005d..a7829bd 100644 --- a/MoCha/Assets/Scripts/CustomAndroidPlugin.cs.meta +++ b/MoCha/Assets/Scripts/CustomAndroidPlugin.cs.meta @@ -1,6 +1,11 @@ fileFormatVersion: 2 +<<<<<<< Updated upstream guid: 80685d60eb42cd340a5c76d410187801 timeCreated: 1524716619 +======= +guid: 1d9a971c325c98e4a81ea4ec2e52aed6 +timeCreated: 1524756178 +>>>>>>> Stashed changes licenseType: Free MonoImporter: externalObjects: {} diff --git a/MoCha/Assets/Scripts/FitBitAPI.cs b/MoCha/Assets/Scripts/FitBitAPI.cs index 7563052..aca4ed7 100644 --- a/MoCha/Assets/Scripts/FitBitAPI.cs +++ b/MoCha/Assets/Scripts/FitBitAPI.cs @@ -42,7 +42,7 @@ namespace Assets.Scripts.Fitbit private OAuth2AccessToken _oAuth2 = new OAuth2AccessToken(); public FitbitData _fitbitData = new FitbitData(); - + private string _statusMessage; private string CallBackUrl @@ -67,7 +67,6 @@ namespace Assets.Scripts.Fitbit { DontDestroyOnLoad(this); } - private void OnGUI() { if (!_bGotTheData && !string.IsNullOrEmpty(_statusMessage) && _bFirstFire) @@ -124,7 +123,6 @@ namespace Assets.Scripts.Fitbit _wwwRequest = new WWW(_tokenUrl, form.data, headers); StartCoroutine(WaitForAccess(_wwwRequest)); - while (!_wwwRequest.isDone) { @@ -136,7 +134,6 @@ namespace Assets.Scripts.Fitbit var parsed = new JSONObject(_wwwRequest.text); ParseAccessToken(parsed); Debug.Log("\nParsed Token: " + _oAuth2.Token); - GetAllData(); Debug.Log("Steps from Fitbit: " + _fitbitData.CurrentSteps); _bGotTheData = true; @@ -157,7 +154,6 @@ namespace Assets.Scripts.Fitbit _wwwRequest = new WWW(_tokenUrl, form.data, headers); StartCoroutine(WaitForAccess(_wwwRequest)); - while (!_wwwRequest.isDone) { } @@ -185,7 +181,6 @@ namespace Assets.Scripts.Fitbit return; _returnCode = code.Substring(CustomAndroidScheme.Length + 6); Debug.Log("Return Code is: " + _returnCode); - UseReturnCode(); } @@ -197,9 +192,6 @@ namespace Assets.Scripts.Fitbit _returnCode = code; UseReturnCode(); } - - - public void GetAllData() { @@ -229,7 +221,7 @@ namespace Assets.Scripts.Fitbit _wwwRequest = new WWW(_profileUrl, null, headers); Debug.Log("Doing GET Request"); StartCoroutine(WaitForAccess(_wwwRequest)); - + while (!_wwwRequest.isDone) { } @@ -247,7 +239,7 @@ namespace Assets.Scripts.Fitbit _wwwRequest = new WWW(_caloriesUrl, null, headers); Debug.Log("Doing Calories GET Request"); StartCoroutine(WaitForAccess(_wwwRequest)); - + while (!_wwwRequest.isDone) { } @@ -263,8 +255,7 @@ namespace Assets.Scripts.Fitbit _wwwRequest = new WWW(_distanceUrl, null, headers); Debug.Log("Doing Distance GET Request"); StartCoroutine(WaitForAccess(_wwwRequest)); - - + while (!_wwwRequest.isDone) { } @@ -281,7 +272,7 @@ namespace Assets.Scripts.Fitbit _wwwRequest = new WWW(_stepsUrl, null, headers); Debug.Log("Doing Steps GET Request"); StartCoroutine(WaitForAccess(_wwwRequest)); - + while (!_wwwRequest.isDone) { } @@ -324,14 +315,13 @@ namespace Assets.Scripts.Fitbit { if (kvp.Key == "avatar") continue; - + //put a space between the camelCase var tempKey = Regex.Replace(kvp.Key, "(\\B[A-Z])", " $1"); //then capitalize the first letter UppercaseFirst(tempKey); } } - _bGotTheData = true; } #endregion @@ -406,7 +396,6 @@ namespace Assets.Scripts.Fitbit XDocument doc = XDocument.Parse(json.InnerXml); var root = doc.Descendants("value").FirstOrDefault(); _fitbitData.CurrentSteps = ToInt(root.Value); - Debug.Log("Steps from Fitbit: " + _fitbitData.CurrentSteps); } @@ -480,7 +469,6 @@ namespace Assets.Scripts.Fitbit Debug.Log(www.error); } Debug.Log("end of WaitForAccess \n"); - } //just a utility function to get the correct date format for activity calls that require one @@ -509,8 +497,6 @@ namespace Assets.Scripts.Fitbit return date; } - - private int ToInt(string thing) { var temp = 0; diff --git a/MoCha/Assets/Scripts/FitBitAPI.cs.meta b/MoCha/Assets/Scripts/FitBitAPI.cs.meta index 8514324..beb83a4 100644 --- a/MoCha/Assets/Scripts/FitBitAPI.cs.meta +++ b/MoCha/Assets/Scripts/FitBitAPI.cs.meta @@ -1,6 +1,11 @@ fileFormatVersion: 2 +<<<<<<< Updated upstream guid: aa5e856e9b878764db7c192f3aa20277 timeCreated: 1524716713 +======= +guid: 849590d4a954ae445aa5db73d734450c +timeCreated: 1524756213 +>>>>>>> Stashed changes licenseType: Free MonoImporter: externalObjects: {} diff --git a/MoCha/Assets/Scripts/FitbitCaller.cs.meta b/MoCha/Assets/Scripts/FitbitCaller.cs.meta index 1dc151a..57119f4 100644 --- a/MoCha/Assets/Scripts/FitbitCaller.cs.meta +++ b/MoCha/Assets/Scripts/FitbitCaller.cs.meta @@ -1,6 +1,11 @@ fileFormatVersion: 2 +<<<<<<< Updated upstream guid: 36444c03eedb84147a326a329de30d0e timeCreated: 1524716713 +======= +guid: 80ba6a52e9d55564fbe8130844b17f29 +timeCreated: 1524756213 +>>>>>>> Stashed changes licenseType: Free MonoImporter: externalObjects: {} diff --git a/MoCha/Assets/Scripts/FitbitData.cs.meta b/MoCha/Assets/Scripts/FitbitData.cs.meta index add5ba3..e0b1ea8 100644 --- a/MoCha/Assets/Scripts/FitbitData.cs.meta +++ b/MoCha/Assets/Scripts/FitbitData.cs.meta @@ -1,6 +1,11 @@ fileFormatVersion: 2 +<<<<<<< Updated upstream guid: 7a928c029cb14204588724261a513ec1 timeCreated: 1524716713 +======= +guid: 1d8622418b8bead4cad17658d650c6c2 +timeCreated: 1524756213 +>>>>>>> Stashed changes licenseType: Free MonoImporter: externalObjects: {} diff --git a/MoCha/Assets/Scripts/JSONObject.cs.meta b/MoCha/Assets/Scripts/JSONObject.cs.meta index c095bab..7347c44 100644 --- a/MoCha/Assets/Scripts/JSONObject.cs.meta +++ b/MoCha/Assets/Scripts/JSONObject.cs.meta @@ -1,6 +1,11 @@ fileFormatVersion: 2 +<<<<<<< Updated upstream guid: da64cad21a33a6444ac511376fcb771b timeCreated: 1524716713 +======= +guid: 9101b04121334074fb6e70fc34eeb3f9 +timeCreated: 1524756213 +>>>>>>> Stashed changes licenseType: Free MonoImporter: externalObjects: {} diff --git a/MoCha/Assets/Scripts/OAuth2AccessToken.cs.meta b/MoCha/Assets/Scripts/OAuth2AccessToken.cs.meta index 320c6d8..ba51381 100644 --- a/MoCha/Assets/Scripts/OAuth2AccessToken.cs.meta +++ b/MoCha/Assets/Scripts/OAuth2AccessToken.cs.meta @@ -1,6 +1,11 @@ fileFormatVersion: 2 +<<<<<<< Updated upstream guid: 2e4069fa83cbbb041aa91e83f7ece28e timeCreated: 1524716713 +======= +guid: 1d4c10710438d404085599a6fe50d37b +timeCreated: 1524756213 +>>>>>>> Stashed changes licenseType: Free MonoImporter: externalObjects: {} diff --git a/MoCha/UpgradeLog.htm b/MoCha/UpgradeLog.htm new file mode 100644 index 0000000000000000000000000000000000000000..d82fb2a026ca7f1a5e53aecda426f1e07087e23c GIT binary patch literal 33450 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