com.xd.sdk.account 7.0.2 → 7.1.0

package/Plugins/iOS/XDAccountSDK.framework/Headers/XDGAccountVersion.h

@@ -4,6 +4,6 @@
 //
 //  Created by Fattycat on 2023/4/14.
 //
-#define XDGAccount_VERSION @"7.0.2"
-#define XDSAccount_VERSION_CODE @"7000020"
-// HASH ed74f1fb
+#define XDGAccount_VERSION @"7.1.0"
+#define XDSAccount_VERSION_CODE @"7001000"
+// HASH 669fedcf

package/Runtime/Internal/Standalone/LoginModule/Email/EmailModule.cs

@@ -208,7 +208,8 @@ namespace XD.SDK.Account.Internal.Standalone
 
                     string scene = e.ExtraData["captcha_scene"] as string;
 
-                    async void Callback(string token, XDGError error)
+                    AliyunTrack.TriggerCaptchaStart("login_email");
+                    XDGCaptcha.ValidateWithCaptcha(scene, new Dictionary<string, string>() { { "eventSessionId", AliyunTrack.LoginEventSessionId } }, (async (token, error) =>
                     {
                         if (!string.IsNullOrEmpty(token))
                         {
@@ -227,10 +228,7 @@ namespace XD.SDK.Account.Internal.Standalone
                         {
                             tcs.TrySetException(error as XDGError ?? throw new InvalidOperationException());
                         }
-                    }
-
-                    AliyunTrack.TriggerCaptchaStart("login_email");
-                    XDGCaptcha.ValidateWithCaptcha(scene, new Dictionary<string, string>(){{"eventSessionId", AliyunTrack.LoginEventSessionId}}, Callback);
+                    }));
                     response = await tcs.Task;
                 }
                 else if (e.Code == INVALID_EMAIL_FORMAT)
@@ -307,7 +305,7 @@ namespace XD.SDK.Account.Internal.Standalone
                         }
                     }
 
-                    XDGCaptcha.ValidateWithCaptcha(scene, new Dictionary<string, string>(){{"eventSessionId", AliyunTrack.LoginEventSessionId}}, Callback);
+                    XDGCaptcha.ValidateWithCaptcha(scene, new Dictionary<string, string>() { { "eventSessionId", AliyunTrack.LoginEventSessionId } }, Callback);
                     response = await tcs.Task;
                 }
                 else

package/Runtime/Internal/Standalone/SupportModule/SupportModule.cs

@@ -78,18 +78,7 @@ namespace XD.SDK.Account.Internal.Standalone
                 }
                 else
                 {
-                    UIManager.ShowUI<XDWebViewAlert>("XDWebViewAlert", new Dictionary<string, object>
-                    {
-                        {
-                            "url", url
-                        }
-                    }, (code, data) =>
-                    {
-                        if (code == XDWebViewAlert.CLOSE_CODE)
-                        {
-                            UIManager.Dismiss();
-                        }
-                    });
+                    Application.OpenURL(url);
                 }
             });
         }
@@ -116,7 +105,7 @@ namespace XD.SDK.Account.Internal.Standalone
                 }
 
                 var response = await XDHttpClient.Client.GetAsync<SupportBaseResponse<SupportUnReadResponse>>(
-                    requestUrl,null, queryMap);
+                    requestUrl, null, queryMap);
 
                 var bHasUnRead = response.Data.HasUnread;
                 var bUnReadStatusChange = bHasUnRead != Instance.bLastHasRead;
@@ -183,27 +172,35 @@ namespace XD.SDK.Account.Internal.Standalone
             XDGLogger.Debug("Support RequestSupportUrl");
             try
             {
-                if (path == null)
+                path = path ?? "";
+                extra = extra ?? new Dictionary<string, object>();
+
+                // 构建 URL-encoded 查询串（更简洁）
+                string Enc(string s)
                 {
-                    path = "";
+                    return Uri.EscapeDataString(s ?? string.Empty);
                 }
 
-                if (extra == null)
+                var parts = new List<string>();
+
+                if (roleInfo != null)
                 {
-                    extra = new Dictionary<string, object>();
+                    if (!string.IsNullOrEmpty(roleInfo.RoleId)) parts.Add($"{Enc("role_id")}={Enc(roleInfo.RoleId)}");
+                    if (!string.IsNullOrEmpty(roleInfo.RoleName)) parts.Add($"{Enc("role_name")}={Enc(roleInfo.RoleName)}");
+                    if (!string.IsNullOrEmpty(roleInfo.ServerId)) parts.Add($"{Enc("server_id")}={Enc(roleInfo.ServerId)}");
                 }
 
-                if (roleInfo != null)
+                foreach (var kv in extra)
                 {
-                    extra.Add("role_id", roleInfo.RoleId);
-                    extra.Add("role_name", roleInfo.RoleName);
-                    extra.Add("server_id", roleInfo.ServerId);
+                    parts.Add($"{Enc(kv.Key)}={Enc(kv.Value != null ? kv.Value.ToString() : string.Empty)}");
                 }
 
+                var urlParams = string.Join("&", parts);
+
                 var data = new Dictionary<string, object>
                 {
                     { "path", path },
-                    { "urlEncodedUserParams", Uri.EscapeDataString(JsonConvert.SerializeObject(extra)) }
+                    { "urlEncodedUserParams", urlParams }
                 };
 
                 var query = new Dictionary<string, object>()

package/Runtime/Internal/Standalone/UserCenterAlert.cs

@@ -271,13 +271,13 @@ namespace XD.SDK.Account.Standalone
             }
             else
             {
-                if (string.IsNullOrEmpty(error.Message))
+                if (string.IsNullOrEmpty(error.ErrorMsg))
                 {
                     UIManager.ShowToast(localizableString.BindError);
                 }
                 else
                 {
-                    UIManager.ShowToast(error.Message);
+                    UIManager.ShowToast(error.ErrorMsg);
                 }
             }
 

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "com.xd.sdk.account",
   "displayName": "XDGSDK Account",
-  "version": "7.0.2",
+  "version": "7.1.0",
   "description": "XDGSDK",
   "unity": "2019.3",
   "license": "MIT",
   "dependencies": {
-    "com.xd.sdk.common": "7.0.2"
+    "com.xd.sdk.common": "7.1.0"
   }
 }