[HUP-821] Fix: Fixed Enum.TryParse for lower C# versions.

EvilMindDevs · Feb 22, 2024 · e0d5c9e · e0d5c9e
1 parent 87ce3c8
commit e0d5c9e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 11 deletions.
diff --git a/Assets/Huawei/Scripts/Game/HMSGameServiceManager.cs b/Assets/Huawei/Scripts/Game/HMSGameServiceManager.cs
@@ -268,19 +268,14 @@ public void OnUpdateInfo(AndroidIntent intent)
             }
             OnAppUpdateInfo?.Invoke(new OnAppUpdateInfoRes(status, rtnCode, rtnMessage, isExit, buttonStatus));
 
-            object statusCodeObj = status;
-            object rtnCodeObj = rtnCode;
-            object buttonStatusObj = buttonStatus;
-
-            if (Enum.TryParse(typeof(AppUpdateStatusCode), statusCodeObj.ToString(), out statusCodeObj) &&
-                Enum.TryParse(typeof(AppUpdateRtnCode), rtnCodeObj.ToString(), out rtnCodeObj) &&
-                Enum.TryParse(typeof(AppUpdateButtonStatus), buttonStatusObj.ToString(), out buttonStatusObj))
+            try
             {
-                Debug.Log($"{TAG} OnUpdateInfo, status: {(AppUpdateStatusCode)statusCodeObj}, rtnCode: {(AppUpdateRtnCode)rtnCodeObj}, rtnMessage: {rtnMessage}, buttonStatus: {(AppUpdateButtonStatus)buttonStatusObj}, isExit: {isExit}");
+                Debug.Log($"{TAG} OnUpdateInfo, status: {(AppUpdateStatusCode)status}," +
+                    $" rtnCode: {(AppUpdateRtnCode)rtnCode}, rtnMessage: {rtnMessage}, buttonStatus: {(AppUpdateButtonStatus)buttonStatus}, isExit: {isExit}");
             }
-            else
+            catch(Exception e)
             {
-                Debug.LogError($"{TAG} Failed to parse status, rtnCode, or buttonStatus as their respective enums");
+                Debug.LogError($"{TAG} Failed to parse status, rtnCode, or buttonStatus as their respective enums exception:{e.Message}");
             }
         }
         public void OnMarketInstallInfo(AndroidIntent intent)

diff --git a/Assets/Huawei/Scripts/Settings/HMSIAPProductListSettings.cs b/Assets/Huawei/Scripts/Settings/HMSIAPProductListSettings.cs
@@ -43,7 +43,7 @@ public List<HMSIAPProductEntry> GetAllIAPProducts()
 
             foreach (var key in _settings.Keys)
             {
-                if (Enum.TryParse(typeof(HMSIAPProductType), _settings.Get(key), out var productType))
+                if (Enum.TryParse<HMSIAPProductType>(_settings.Get(key), out var productType))
                 {
                     returnList.Add(new HMSIAPProductEntry(key, (HMSIAPProductType)productType));
                 }