com.xd.sdk.common 7.1.0 → 7.1.2

package/Runtime/Internal/Standalone/IPInfo/IPInfoModule.cs

@@ -7,8 +7,10 @@ using System.Net.Http.Headers;
 using UnityEngine;
 using Newtonsoft.Json;
 
-namespace XD.SDK.Common.Internal.Standalone {
-    public class IPInfoModule {
+namespace XD.SDK.Common.Internal.Standalone
+{
+    public class IPInfoModule
+    {
         //IP信息
         private readonly static string IP_INFO = "https://ip.xindong.com/myloc2";
 
@@ -20,63 +22,83 @@ namespace XD.SDK.Common.Internal.Standalone {
 
         private static HttpClient client;
 
-       public static HttpClient Client {
-            get {
-                if (client == null) {
+        public static HttpClient Client
+        {
+            get
+            {
+                if (client == null)
+                {
                     client = new HttpClient();
                     client.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json"));
                     client.Timeout = TimeSpan.FromSeconds(3);
                 }
+
                 return client;
             }
         }
 
-       public static async Task SaveToLocal(XDGRegionInfo xdgRegionInfo) {
+        public static async Task SaveToLocal(XDGRegionInfo xdgRegionInfo)
+        {
             await persistence.Save(xdgRegionInfo);
             local = xdgRegionInfo;
         }
 
-       public static async Task<XDGRegionInfo> GetLocalIPInfo() {
-            if (local == null) {
+        public static async Task<XDGRegionInfo> GetLocalIPInfo()
+        {
+            if (local == null)
+            {
                 local = await persistence.Load<XDGRegionInfo>();
             }
+
             return local;
         }
 
-       public static XDGRegionInfo GetCachedIPInfo(){
+        public static XDGRegionInfo GetCachedIPInfo()
+        {
             return local;
         }
 
-       public static async Task<XDGRegionInfo> RequestIpInfo() {
-            try {
+        public static async Task<XDGRegionInfo> RequestIpInfo()
+        {
+            try
+            {
                 HttpResponseMessage response = await Client.GetAsync(IP_INFO);
                 string resultString = await response.Content.ReadAsStringAsync();
-                if (response.IsSuccessStatusCode) {
+                if (response.IsSuccessStatusCode)
+                {
                     XDGRegionInfo ret = JsonConvert.DeserializeObject<XDGRegionInfo>(resultString);
                     return ret;
                 }
+
                 throw new XDGError((int)response.StatusCode, resultString);
-            } catch (Exception e) {
-                XDGLogger.Warn($"Request IP info error: {e}");
+            }
+            catch (Exception e)
+            {
+                XDGLogger.Warn($"Request IP info error: {e}", XDGLoggerTag.Http);
                 throw e;
             }
         }
 
-       public static async Task<XDGRegionInfo> GetIpInfo() {
-            try {
+        public static async Task<XDGRegionInfo> GetIpInfo()
+        {
+            try
+            {
                 XDGRegionInfo xdgRegionInfo = await RequestIpInfo();
                 return xdgRegionInfo;
-            } catch (Exception e) {
-                XDGLogger.Warn($"Get IP error: {e}");
+            }
+            catch (Exception e)
+            {
+                XDGLogger.Warn($"Get IP error: {e}", XDGLoggerTag.Http);
                 XDGRegionInfo xdgRegionInfo = await IPInfoModule.GetLocalIPInfo();
                 return xdgRegionInfo;
             }
         }
 
-       public static async void RequestIpInfoAndSave(){
+        public static async void RequestIpInfoAndSave()
+        {
             XDGRegionInfo xdgRegionInfo = await GetIpInfo();
             await SaveToLocal(xdgRegionInfo);
         }
     }
 }
-#endif
+#endif

package/Runtime/Internal/Standalone/IPInfo/XDGAreaCode.cs

@@ -36,7 +36,7 @@ namespace XD.SDK.Common.Internal.Standalone
             }
             catch (Exception e)
             {
-                XDGLogger.Warn($"拉取区号列表失败: {e}");
+                XDGLogger.Warn($"拉取区号列表失败: {e}", XDGLoggerTag.Common);
                 var areaCodesStorage = await persistence.Load<List<AreaCodeData>>();
                 if (areaCodesStorage?.Count > 0)
                 {

package/Runtime/Internal/Standalone/Persistence/Persistence.cs

@@ -7,72 +7,92 @@ using Newtonsoft.Json;
 using XD.SDK.Common;
 using XD.SDK.Common.Internal;
 
-namespace XD.SDK.Common.Internal.Standalone {
+namespace XD.SDK.Common.Internal.Standalone
+{
     /// <summary>
     /// 通用 JSON 序列化工具
     /// </summary>
-    public class Persistence {
+    public class Persistence
+    {
         private readonly string filePath;
 
-        public Persistence(string path) {
+        public Persistence(string path)
+        {
             filePath = path;
         }
 
-        public async Task<T> Load<T>(string key = null) where T : class {
-            if (!File.Exists(filePath)) {
+        public async Task<T> Load<T>(string key = null) where T : class
+        {
+            if (!File.Exists(filePath))
+            {
                 return null;
             }
 
-            try {
+            try
+            {
                 string text;
-                using (FileStream fs = File.OpenRead(filePath)) {
+                using (FileStream fs = File.OpenRead(filePath))
+                {
                     byte[] buffer = new byte[fs.Length];
                     await fs.ReadAsync(buffer, 0, (int)fs.Length);
                     text = Encoding.UTF8.GetString(buffer);
 
-                    if (!string.IsNullOrEmpty(key)) {
+                    if (!string.IsNullOrEmpty(key))
+                    {
                         text = EncryptionUtils.Decrypt(text, key);
                     }
                 }
+
                 return JsonConvert.DeserializeObject<T>(text);
-            } catch (Exception e) {
-                XDGLogger.Warn(e.Message);
+            }
+            catch (Exception e)
+            {
+                XDGLogger.Warn(e.Message, XDGLoggerTag.Common);
                 Delete();
                 return null;
             }
         }
 
-        public async Task Save<T>(T obj, string key = null) {
-            if (obj == null) {
-                XDGLogger.Warn("Saved object is null.");
+        public async Task Save<T>(T obj, string key = null)
+        {
+            if (obj == null)
+            {
+                XDGLogger.Warn("Saved object is null.", XDGLoggerTag.Common);
                 return;
             }
 
             string text;
-            try {
+            try
+            {
                 text = JsonConvert.SerializeObject(obj);
 
-                if (!string.IsNullOrEmpty(key)) {
+                if (!string.IsNullOrEmpty(key))
+                {
                     text = EncryptionUtils.Encrypt(text, key);
                 }
 
                 string dirPath = Path.GetDirectoryName(filePath);
-                if (!Directory.Exists(dirPath)) {
+                if (!Directory.Exists(dirPath))
+                {
                     Directory.CreateDirectory(dirPath);
                 }
 
-                using (FileStream fs = File.Create(filePath)) {
+                using (FileStream fs = File.Create(filePath))
+                {
                     byte[] buffer = Encoding.UTF8.GetBytes(text);
                     await fs.WriteAsync(buffer, 0, buffer.Length);
                 }
-            } catch (Exception e) {
-                XDGLogger.Warn(e.Message);
-                return;
+            }
+            catch (Exception e)
+            {
+                XDGLogger.Error(e, XDGLoggerTag.Common);
             }
         }
 
-        public void Delete() {
-            if (!File.Exists(filePath)) {
+        public void Delete()
+        {
+            if (!File.Exists(filePath))
+            {
                 return;
             }
 

package/Runtime/Internal/Standalone/Steam/SteamUtils.cs

@@ -4,11 +4,13 @@ using System.Linq;
 using System.Threading.Tasks;
 using UnityEngine;
 
-namespace XD.SDK.Common.Internal.Standalone {
+namespace XD.SDK.Common.Internal.Standalone
+{
     /// <summary>
     /// Steam SDK 封装接口
     /// </summary>
-    public interface ISteamSDKWrapper {
+    public interface ISteamSDKWrapper
+    {
         Task<string> GetAuthTicket();
         string GetSteamId();
         string GetSteamLanguage();
@@ -16,18 +18,23 @@ namespace XD.SDK.Common.Internal.Standalone {
         string GetSteamCountry();
     }
 
-    public class SteamUtils {
+    public class SteamUtils
+    {
         public static ISteamSDKWrapper Instance { get; private set; }
 
-        static SteamUtils() {
+        static SteamUtils()
+        {
             Type interfaceType = typeof(ISteamSDKWrapper);
             Type steamWrapperType = AppDomain.CurrentDomain.GetAssemblies()
                 .SelectMany(assembly => assembly.GetTypes())
                 .FirstOrDefault(clazz => interfaceType.IsAssignableFrom(clazz) && clazz.IsClass);
-            if (steamWrapperType != null) {
+            if (steamWrapperType != null)
+            {
                 Instance = Activator.CreateInstance(steamWrapperType) as ISteamSDKWrapper;
-            } else {
-                XDGLogger.Warn($"No class implements {interfaceType} Type. Current Platform: {Application.platform}, if you are using Editor, please check if you have installed XDSDK pc module.");
+            }
+            else
+            {
+                XDGLogger.Warn($"No class implements {interfaceType} Type. Current Platform: {Application.platform}, if you are using Editor, please check if you have installed XDSDK pc module.", XDGLoggerTag.Common);
             }
         }
 

package/Runtime/Internal/Standalone/Track/AliyunTrack.cs

@@ -240,7 +240,7 @@ namespace XD.SDK.Common.Internal.Standalone
             }
             catch (Exception e)
             {
-                XDGLogger.Warn($"[XD::LogEventAsync] TrackAsync Event Error! Message: {e.Message}\n{e.StackTrace}");
+                XDGLogger.Warn($"[XD::LogEventAsync] TrackAsync Event Error! Message: {e.Message}\n{e.StackTrace}", XDGLoggerTag.Track);
             }
         }
 
@@ -260,7 +260,7 @@ namespace XD.SDK.Common.Internal.Standalone
                             string resultString = await responseMessage.Content.ReadAsStringAsync();
                             var badResponse = JsonConvert.DeserializeObject<AliyunTrackBadResponse>(resultString);
                             XDGLogger.Warn(string.Format(
-                                $"[XD::TrackAsync] request failed! \n statusCode: {responseMessage.StatusCode} errorCode : {badResponse?.errorCode} errorMessage : {badResponse?.errorMessage}"));
+                                $"[XD::TrackAsync] request failed! \n statusCode: {responseMessage.StatusCode} errorCode : {badResponse?.errorCode} errorMessage : {badResponse?.errorMessage}"), XDGLoggerTag.Track);
                         }
 
                         responseMessage.Dispose();
@@ -268,7 +268,7 @@ namespace XD.SDK.Common.Internal.Standalone
                     }
                     catch (Exception e)
                     {
-                        XDGLogger.Warn(string.Format($"[XD::TrackAsync] request failed! Message: {e.Message}\n {e.StackTrace}"));
+                        XDGLogger.Warn(string.Format($"[XD::TrackAsync] request failed! Message: {e.Message}\n {e.StackTrace}"), XDGLoggerTag.Track);
                         requestList.RemoveAt(0);
                     }
                 }
@@ -343,11 +343,11 @@ namespace XD.SDK.Common.Internal.Standalone
 
             try
             {
-                XDGLogger.Warn($"TrackAsync Info:\n{sb}");
+                XDGLogger.Warn($"TrackAsync Info:\n{sb}", XDGLoggerTag.Track);
             }
             catch (Exception e)
             {
-                XDGLogger.Error($"{e.Message}\n{e.StackTrace}");
+                XDGLogger.Error($"{e.Message}\n{e.StackTrace}", XDGLoggerTag.Track);
             }
         }
 

package/Runtime/Internal/Standalone/UI/Base/UIManager.cs

@@ -86,6 +86,7 @@ namespace XD.SDK.Common.Internal.Standalone
                 Instance.StopCoroutine(Instance.loadingTimeoutCoroutine);
                 Instance.loadingTimeoutCoroutine = null;
             }
+
             Instance.loading.transform.SetAsLastSibling();
             Instance.loading.SetActive(true);
             Instance.UpdateMask();
@@ -163,7 +164,7 @@ namespace XD.SDK.Common.Internal.Standalone
             GameObject gameObj = Instantiate(Resources.Load("Prefabs/" + prefabName)) as GameObject;
             if (gameObj == null)
             {
-                XDGLogger.Debug("没找到 prefab named： \"" + prefabName + "\"");
+                XDGLogger.Debug("没找到 prefab named： \"" + prefabName + "\"", XDGLoggerTag.Common);
                 return null;
             }
             else
@@ -196,7 +197,7 @@ namespace XD.SDK.Common.Internal.Standalone
         {
             if (uiElements.Count == 0)
             {
-                XDGLogger.Debug("没有 UIElement 子类可处理.");
+                XDGLogger.Debug("没有 UIElement 子类可处理.", XDGLoggerTag.Common);
             }
             else
             {

package/Runtime/Internal/Standalone/UI/Controllers/CancelAccountAlert.cs

@@ -5,11 +5,14 @@ using UnityEngine.UI;
 using Vuplex.WebView;
 using Vuplex.WebView.Internal;
 
-namespace XD.SDK.Common.Internal.Standalone {
-    public class CancelAccountAlert : UIElement {
+namespace XD.SDK.Common.Internal.Standalone
+{
+    public class CancelAccountAlert : UIElement
+    {
         public const int CANCEL_DONE_CODE = 0;
 
-        static readonly string[] ALLOWN_KEYS = new string[] {
+        static readonly string[] ALLOWN_KEYS = new string[]
+        {
             "Tab", "ArrowUp", "ArrowDown", "ArrowRight", "ArrowLeft", "Escape", "Delete", "Home", "End", "Insert", "PageUp", "PageDown", "Help", "Backspace"
         };
 
@@ -27,7 +30,8 @@ namespace XD.SDK.Common.Internal.Standalone {
 
         private bool hasCancelled;
 
-        private void Awake() {
+        private void Awake()
+        {
             Input.imeCompositionMode = IMECompositionMode.On;
 
             titleText = transform.Find("Header/Title").GetComponent<Text>();
@@ -59,7 +63,8 @@ namespace XD.SDK.Common.Internal.Standalone {
             loadFailedGO.SetActive(false);
         }
 
-        private async void Start() {
+        private async void Start()
+        {
             await canvasWebViewPrefab.WaitUntilInitialized();
 
             canvasWebViewPrefab.WebView.FocusedInputFieldChanged += OnFocusedInputFieldChanged;
@@ -76,26 +81,33 @@ namespace XD.SDK.Common.Internal.Standalone {
             LoadCancelAccountPage();
         }
 
-        private void Update() {
-            if (!webInputFocused) {
+        private void Update()
+        {
+            if (!webInputFocused)
+            {
                 return;
             }
 
             Event curEvt = new Event();
-            while (Event.PopEvent(curEvt)) {
+            while (Event.PopEvent(curEvt))
+            {
                 char ch = curEvt.character;
-                if (ch == '\0') {
+                if (ch == '\0')
+                {
                     continue;
                 }
+
                 canvasWebViewPrefab.WebView.SendKey(ch.ToString());
             }
         }
 
-        private void OnDestroy() {
+        private void OnDestroy()
+        {
             nativeKeyboardListener.KeyDownReceived -= OnKeyDownReceived;
             nativeKeyboardListener.KeyUpReceived -= OnKeyUpReceived;
 
-            if (nativeKeyboardListener.gameObject) {
+            if (nativeKeyboardListener.gameObject)
+            {
                 Destroy(nativeKeyboardListener?.gameObject);
             }
 
@@ -105,54 +117,68 @@ namespace XD.SDK.Common.Internal.Standalone {
             canvasWebViewPrefab.WebView.TitleChanged -= OnTitleChanged;
         }
 
-        void OnTitleChanged(object sender, EventArgs<string> args) {
+        void OnTitleChanged(object sender, EventArgs<string> args)
+        {
             titleText.text = args.Value;
         }
 
-        void OnUrlChanged(object sender, UrlChangedEventArgs eventArgs) {
+        void OnUrlChanged(object sender, UrlChangedEventArgs eventArgs)
+        {
             string url = eventArgs.Url;
             Uri uri = new Uri(url);
             string path = uri.AbsolutePath;
-            if (!string.IsNullOrEmpty(path) && path.Contains("success")) {
+            if (!string.IsNullOrEmpty(path) && path.Contains("success"))
+            {
                 // 注销完成
-                XDGLogger.Debug("注销成功");
+                XDGLogger.Debug("注销成功", XDGLoggerTag.Common);
                 hasCancelled = true;
             }
         }
 
-        void OnPageLoadFailed(object sender, EventArgs eventArgs) {
+        void OnPageLoadFailed(object sender, EventArgs eventArgs)
+        {
             ShowError(XDLocalization.GetCurrentLocalizableString().LoadError);
         }
 
-        void OnCloseButtonClicked() {
+        void OnCloseButtonClicked()
+        {
             UIManager.Dismiss();
-            if (hasCancelled) {
+            if (hasCancelled)
+            {
                 OnCallback(CANCEL_DONE_CODE, null);
             }
         }
 
-        void OnRetryButtonClicked() {
+        void OnRetryButtonClicked()
+        {
             loadFailedGO.SetActive(false);
             LoadCancelAccountPage();
         }
 
-        void LoadCancelAccountPage() {
-            if (Application.internetReachability == NetworkReachability.NotReachable) {
+        void LoadCancelAccountPage()
+        {
+            if (Application.internetReachability == NetworkReachability.NotReachable)
+            {
                 // 没网
                 ShowError(XDLocalization.GetCurrentLocalizableString().NetError);
-            } else {
+            }
+            else
+            {
                 string url = Extra["url"] as string;
                 canvasWebViewPrefab.WebView.LoadUrl(url);
             }
         }
 
-        void ShowError(string message) {
+        void ShowError(string message)
+        {
             loadFailedTipsText.text = message;
             loadFailedGO.SetActive(true);
         }
 
-        void OnKeyDownReceived(object sender, KeyboardEventArgs eventArgs) {
-            if (!IsAllownKey(eventArgs)) {
+        void OnKeyDownReceived(object sender, KeyboardEventArgs eventArgs)
+        {
+            if (!IsAllownKey(eventArgs))
+            {
                 return;
             }
 
@@ -160,32 +186,42 @@ namespace XD.SDK.Common.Internal.Standalone {
             webViewWithKeyDown?.KeyDown(eventArgs.Key, eventArgs.Modifiers);
         }
 
-        void OnKeyUpReceived(object sender, KeyboardEventArgs eventArgs) {
-            if (!IsAllownKey(eventArgs)) {
+        void OnKeyUpReceived(object sender, KeyboardEventArgs eventArgs)
+        {
+            if (!IsAllownKey(eventArgs))
+            {
                 return;
             }
+
             IWithKeyDownAndUp webViewWithKeyUp = canvasWebViewPrefab.WebView as IWithKeyDownAndUp;
             webViewWithKeyUp?.KeyUp(eventArgs.Key, eventArgs.Modifiers);
         }
 
-        void OnFocusedInputFieldChanged(object sender, FocusedInputFieldChangedEventArgs args) {
+        void OnFocusedInputFieldChanged(object sender, FocusedInputFieldChangedEventArgs args)
+        {
             FocusedInputFieldType focusedType = args.Type;
             webInputFocused = focusedType == FocusedInputFieldType.Text;
         }
 
-        static bool IsAllownKey(KeyboardEventArgs eventArgs) {
+        static bool IsAllownKey(KeyboardEventArgs eventArgs)
+        {
             string key = eventArgs.Key;
             KeyModifier modifier = eventArgs.Modifiers;
-            if (modifier == KeyModifier.None) {
-                foreach (string allownKey in ALLOWN_KEYS) {
-                    if (allownKey.Equals(key)) {
+            if (modifier == KeyModifier.None)
+            {
+                foreach (string allownKey in ALLOWN_KEYS)
+                {
+                    if (allownKey.Equals(key))
+                    {
                         return true;
                     }
                 }
+
                 return false;
             }
+
             return true;
         }
     }
 }
-#endif
+#endif