Handle version check www error, add recommend build target, disable Simulator by default

Author: lawwong

Assets/HTC.UnityPlugin/ViveInputUtility/Scripts/Editor/VIUVersionCheck.cs

@@ -159,6 +159,24 @@ private static void InitializeSettins()
             //    recommendedValue = true,
             //});
 
+            s_settings.Add(new RecommendedSetting<BuildTarget>()
+            {
+                settingTitle = "Build Target",
+                skipCheckFunc = () => VRModule.isSteamVRPluginDetected || VIUSettingsEditor.activeBuildTargetGroup == BuildTargetGroup.Standalone || VIUSettingsEditor.activeBuildTargetGroup == BuildTargetGroup.Android,
+                currentValueFunc = () => EditorUserBuildSettings.activeBuildTarget,
+                setValueFunc = v =>
+                {
+#if UNITY_2017_1_OR_NEWER
+                    EditorUserBuildSettings.SwitchActiveBuildTargetAsync(BuildTargetGroup.Standalone, BuildTarget.StandaloneWindows64);
+#elif UNITY_5_6_OR_NEWER
+                    EditorUserBuildSettings.SwitchActiveBuildTarget(BuildTargetGroup.Standalone, BuildTarget.StandaloneWindows64);
+#else
+                    EditorUserBuildSettings.SwitchActiveBuildTarget(BuildTarget.StandaloneWindows64);
+#endif
+                },
+                recommendedValue = BuildTarget.StandaloneWindows64,
+            });
+
             s_settings.Add(new RecommendedSetting<bool>()
             {
                 settingTitle = "Load Binding Config on Start",
@@ -384,11 +402,11 @@ private static void CheckVersionAndSettings()
                     return;
                 }
 
+                // On Windows, PlaterSetting is stored at \HKEY_CURRENT_USER\Software\Unity Technologies\Unity Editor 5.x
+                EditorPrefs.SetString(nextVersionCheckTimeKey, UtcDateTimeToStr(DateTime.UtcNow.AddMinutes(versionCheckIntervalMinutes)));
+
                 if (UrlSuccess(www))
                 {
-                    // On Windows, PlaterSetting is stored at \HKEY_CURRENT_USER\Software\Unity Technologies\Unity Editor 5.x
-                    EditorPrefs.SetString(nextVersionCheckTimeKey, UtcDateTimeToStr(DateTime.UtcNow.AddMinutes(versionCheckIntervalMinutes)));
-
                     latestRepoInfo = JsonUtility.FromJson<RepoInfo>(www.text);
                 }
 
@@ -468,35 +486,46 @@ private static string UtcDateTimeToStr(DateTime utcDateTime)
 
         private static bool UrlSuccess(WWW www)
         {
-            if (!string.IsNullOrEmpty(www.error))
+            try
             {
-                // API rate limit exceeded, see https://developer.github.com/v3/#rate-limiting
-                Debug.Log("url:" + www.url);
-                Debug.Log("error:" + www.error);
-                Debug.Log(www.text);
-
-                string responseHeader;
-                if (www.responseHeaders.TryGetValue("X-RateLimit-Limit", out responseHeader))
+                if (!string.IsNullOrEmpty(www.error))
                 {
-                    Debug.Log("X-RateLimit-Limit:" + responseHeader);
-                }
-                if (www.responseHeaders.TryGetValue("X-RateLimit-Remaining", out responseHeader))
-                {
-                    Debug.Log("X-RateLimit-Remaining:" + responseHeader);
+                    // API rate limit exceeded, see https://developer.github.com/v3/#rate-limiting
+                    Debug.Log("url:" + www.url);
+                    Debug.Log("error:" + www.error);
+                    Debug.Log(www.text);
+
+                    if (www.responseHeaders != null)
+                    {
+                        string responseHeader;
+                        if (www.responseHeaders.TryGetValue("X-RateLimit-Limit", out responseHeader))
+                        {
+                            Debug.Log("X-RateLimit-Limit:" + responseHeader);
+                        }
+                        if (www.responseHeaders.TryGetValue("X-RateLimit-Remaining", out responseHeader))
+                        {
+                            Debug.Log("X-RateLimit-Remaining:" + responseHeader);
+                        }
+                        if (www.responseHeaders.TryGetValue("X-RateLimit-Reset", out responseHeader))
+                        {
+                            Debug.Log("X-RateLimit-Reset:" + TimeZone.CurrentTimeZone.ToLocalTime(new DateTime(1970, 1, 1, 0, 0, 0, DateTimeKind.Utc).AddSeconds(double.Parse(responseHeader))).ToString());
+                        }
+                    }
+
+                    return false;
                 }
-                if (www.responseHeaders.TryGetValue("X-RateLimit-Reset", out responseHeader))
+
+                if (Regex.IsMatch(www.text, "404 not found", RegexOptions.IgnoreCase))
                 {
-                    Debug.Log("X-RateLimit-Reset:" + TimeZone.CurrentTimeZone.ToLocalTime(new DateTime(1970, 1, 1, 0, 0, 0, DateTimeKind.Utc).AddSeconds(double.Parse(responseHeader))).ToString());
+                    Debug.Log("url:" + www.url);
+                    Debug.Log("error:" + www.error);
+                    Debug.Log(www.text);
+                    return false;
                 }
-
-                return false;
             }
-
-            if (Regex.IsMatch(www.text, "404 not found", RegexOptions.IgnoreCase))
+            catch (Exception e)
             {
-                Debug.Log("url:" + www.url);
-                Debug.Log("error:" + www.error);
-                Debug.Log(www.text);
+                Debug.LogWarning(e);
                 return false;
             }
 

Assets/HTC.UnityPlugin/ViveInputUtility/Scripts/VIUSettings.cs

@@ -27,7 +27,7 @@ public class VIUSettings : ScriptableObject
         public const KeyCode EXTERNAL_CAMERA_SWITCH_KEY_DEFAULT_VALUE = KeyCode.M;
         public const KeyCode EXTERNAL_CAMERA_SWITCH_KEY_MODIFIER_DEFAULT_VALUE = KeyCode.RightShift;
 
-        public const bool ACTIVATE_SIMULATOR_MODULE_DEFAULT_VALUE = true;
+        public const bool ACTIVATE_SIMULATOR_MODULE_DEFAULT_VALUE = false;
         public const bool SIMULATOR_AUTO_TRACK_MAIN_CAMERA_DEFAULT_VALUE = true;
         public const bool ENABLE_SIMULATOR_KEYBOARD_MOUSE_CONTROL_DEFAULT_VALUE = true;
         public const bool SIMULATE_TRACKPAD_TOUCH_DEFAULT_VALUE = true;

Assets/HTC.UnityPlugin/ViveInputUtility/Scripts/VIUVersion.cs

@@ -6,6 +6,6 @@ namespace HTC.UnityPlugin.Vive
 {
     public static class VIUVersion
     {
-        public static readonly Version current = new Version("1.8.0.1");
+        public static readonly Version current = new Version("1.8.0.2");
     }
 }