com.xd.sdk.account 0.0.11-alpha → 0.0.14-alpha

package/Plugins/Android/libs/XDGBridgeAccount_v7_7.0.0.aar.meta

@@ -0,0 +1,32 @@
+fileFormatVersion: 2
+guid: c384e2e57d3c54ea79502c23b2a03280
+PluginImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  iconMap: {}
+  executionOrder: {}
+  defineConstraints: []
+  isPreloaded: 0
+  isOverridable: 1
+  isExplicitlyReferenced: 0
+  validateReferences: 1
+  platformData:
+  - first:
+      Android: Android
+    second:
+      enabled: 1
+      settings: {}
+  - first:
+      Any: 
+    second:
+      enabled: 0
+      settings: {}
+  - first:
+      Editor: Editor
+    second:
+      enabled: 0
+      settings:
+        DefaultValueInitialized: true
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

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

@@ -6,4 +6,4 @@
 //
 #define XDGAccount_VERSION @"7.0.0"
 #define XDSAccount_VERSION_CODE @"7000000"
-// HASH 7f0303a
+// HASH 8bd7e79

package/Runtime/Internal/Mobile/AccountFeaturesImpl.cs

@@ -66,13 +66,13 @@ namespace XD.SDK.Account.Internal.Mobile
         private AccountFeaturesImpl()
         {
             EngineBridge.GetInstance()
-                .Register(BridgeConstants.Account.SERVICE_NAME, BridgeConstants.Account.SERVICE_IMPL);
+                .Register(BridgeConstants.Account.ServiceName, BridgeConstants.Account.ServiceImpl);
         }
 
         public void AddUserStatusChangeCallback(Action<XDGUserStatusCodeType, string> callback)
         {
             var command = new Command.Builder()
-                .Service(BridgeConstants.Account.BRIDGE_NAME)
+                .Service(BridgeConstants.Account.BridgeName)
                 .Method("addUserStatusChangeCallback")
                 .Callback(true)
                 .OnceTime(false)
@@ -94,7 +94,7 @@ namespace XD.SDK.Account.Internal.Mobile
         public void LoginByType(LoginType loginType, Action<XDGUser> callback, Action<XDGError> errorCallback)
         {
             var command = new Command.Builder()
-                .Service(BridgeConstants.Account.BRIDGE_NAME)
+                .Service(BridgeConstants.Account.BridgeName)
                 .Method("loginByType")
                 .Args("loginType", loginType.FormatString()) //和app交互用的是字符串，如TapTap 
                 .Callback(true)
@@ -124,6 +124,7 @@ namespace XD.SDK.Account.Internal.Mobile
                     {
                         XDGEventBus.Publish(XDGEvents.TdsSDKRefreshFacebookTime);
                     }
+
                     callback(user);
                     return;
                 }
@@ -141,7 +142,7 @@ namespace XD.SDK.Account.Internal.Mobile
         public void Logout()
         {
             var command = new Command.Builder()
-                .Service(BridgeConstants.Account.BRIDGE_NAME)
+                .Service(BridgeConstants.Account.BridgeName)
                 .Method("logout")
                 .Callback(false)
                 .OnceTime(true)
@@ -154,7 +155,7 @@ namespace XD.SDK.Account.Internal.Mobile
             XDGUser resultUser = null;
             string currentUserString = null;
 #if UNITY_ANDROID
-            using (var accountBridgeClass = new AndroidJavaClass(BridgeConstants.Account.SERVICE_IMPL))
+            using (var accountBridgeClass = new AndroidJavaClass(BridgeConstants.Account.BridgeStaticImpl))
             {
                 currentUserString = accountBridgeClass.CallStatic<string>("getCurrentUser");
             }
@@ -185,7 +186,7 @@ namespace XD.SDK.Account.Internal.Mobile
         public void OpenCustomerService(XDGRoleInfo roleInfo, string path, Dictionary<string, object> paramsMap)
         {
             var command = new Command.Builder()
-                .Service(BridgeConstants.Account.BRIDGE_NAME)
+                .Service(BridgeConstants.Account.BridgeName)
                 .Method("openCustomerService")
                 .Args(XDUtility.BridgeArgToDictionary("openCustomerService", roleInfo))
                 .Args("path", path)
@@ -199,7 +200,7 @@ namespace XD.SDK.Account.Internal.Mobile
         public void OpenUserCenter()
         {
             var command = new Command.Builder()
-                .Service(BridgeConstants.Account.BRIDGE_NAME)
+                .Service(BridgeConstants.Account.BridgeName)
                 .Method("openUserCenter")
                 .Callback(false)
                 .OnceTime(true)
@@ -210,7 +211,7 @@ namespace XD.SDK.Account.Internal.Mobile
         public void OpenUserDashboard(XDGRoleInfo roleInfo)
         {
             var command = new Command.Builder()
-                .Service(BridgeConstants.Account.BRIDGE_NAME)
+                .Service(BridgeConstants.Account.BridgeName)
                 .Method("openUserDashboard")
                 .Args(XDUtility.BridgeArgToDictionary("openUserDashboard", roleInfo))
                 .Callback(false)
@@ -222,7 +223,7 @@ namespace XD.SDK.Account.Internal.Mobile
         public void OpenAccountDeletion()
         {
             var command = new Command.Builder()
-                .Service(BridgeConstants.Account.BRIDGE_NAME)
+                .Service(BridgeConstants.Account.BridgeName)
                 .Method("openAccountDeletion")
                 .Callback(false)
                 .OnceTime(true)
@@ -233,7 +234,7 @@ namespace XD.SDK.Account.Internal.Mobile
         public void BindByType(LoginType loginType, Action<bool, XDGError> callback)
         {
             var command = new Command.Builder()
-                .Service(BridgeConstants.Account.BRIDGE_NAME)
+                .Service(BridgeConstants.Account.BridgeName)
                 .Method("bindByType")
                 .Args("bindByType", loginType.FormatString())
                 .Callback(true)
@@ -264,9 +265,9 @@ namespace XD.SDK.Account.Internal.Mobile
             var method = request.Method.ToString().ToUpper();
             var authorization = "";
 #if UNITY_ANDROID
-            using (var AccountBridgeClass = new AndroidJavaClass(BridgeConstants.Account.SERVICE_IMPL))
+            using (var accountBridgeClass = new AndroidJavaClass(BridgeConstants.Account.BridgeStaticImpl))
             {
-                authorization = AccountBridgeClass.CallStatic<string>("getRequestAuthorizationHeaderString", url, method, timestamp);
+                authorization = accountBridgeClass.CallStatic<string>("getRequestAuthorizationHeaderString", url, method, timestamp);
             }
 #elif UNITY_IOS
             IntPtr ptr = XDAccountBridgeGetAuthorization(url, method, timestamp);
@@ -298,7 +299,8 @@ namespace XD.SDK.Account.Internal.Mobile
                     return;
                 }
 
-                // XDGEventBus.Publish(XDGEvents.TdsSDKLogout);
+                //TODO 同步之前先退登 TDSUser
+                XDGEventBus.Publish(XDGEvents.TdsSDKLogout);
                 var response = await HttpClient.PostAsync<LoginSyncResponse>(LoginSynUrl);
                 var sessionToken = XDDictionary.GetValue<string>(response.Data, "sessionToken");
                 if (string.IsNullOrEmpty(sessionToken))
@@ -306,7 +308,6 @@ namespace XD.SDK.Account.Internal.Mobile
                     XDGLogger.Warn("[SyncTDSUser] sessionToken is Null!");
                     return;
                 }
-
                 XDGEventBus.Publish(XDGEvents.TdsSDKSyncUser, sessionToken, user.UserId);
             }
             catch (Exception e)
@@ -318,7 +319,7 @@ namespace XD.SDK.Account.Internal.Mobile
         private void RefreshFacebookToken()
         {
 #if UNITY_ANDROID
-            using (var accountBridgeClass = new AndroidJavaClass(BridgeConstants.Account.SERVICE_IMPL))
+            using (var accountBridgeClass = new AndroidJavaClass(BridgeConstants.Account.BridgeStaticImpl))
             {
                 var fbToken = accountBridgeClass.CallStatic<string>("getFacebookToken");
                 XDGLogger.Debug($"[GetFacebookToken] fbToken:{fbToken}");
@@ -328,7 +329,6 @@ namespace XD.SDK.Account.Internal.Mobile
                     XDGLogger.Warn($"[GetFacebookToken] error:{JsonConvert.SerializeObject(tokenDic)}");
                     return;
                 }
-
                 var token = XDDictionary.GetValue<string>(tokenDic, "access_token");
                 var userId = XDDictionary.GetValue<string>(tokenDic, "userID");
                 XDGEventBus.Publish(XDGEvents.TdsSDKSyncFacebookToken, token, userId);

package/Runtime/Internal/Standalone/AccountFeaturesImpl.cs

@@ -44,7 +44,6 @@ namespace XD.SDK.Account.Internal.Standalone
         {
         }
 
-
         internal static Action<XDGUserStatusCodeType, string> UserStatusChangeCallback;
 
         public void AddUserStatusChangeCallback(Action<XDGUserStatusCodeType, string> callback)
@@ -240,9 +239,10 @@ namespace XD.SDK.Account.Internal.Standalone
                 AliyunTrack.LoginAntiAddictionStartup();
                 var complianceResult =
                     await XDGEventBus.PublishAsync<Dictionary<string, object>>(XDGEvents.TapSDKComplianceStartup, ConfigModule.IsGlobal, user.UserId);
-                AliyunTrack.LoginAntiAddictionResult(XDDictionary.GetValue<int>(complianceResult, "code", -100),
-                    XDDictionary.GetValue<string>(complianceResult, "reason"),
-                    XDDictionary.GetValue<string>(complianceResult, "extras"));
+                // TODO 统一走回调进行埋点
+                // AliyunTrack.LoginAntiAddictionResult(XDDictionary.GetValue(complianceResult, "code", -100),
+                // XDDictionary.GetValue<string>(complianceResult, "reason"),
+                // XDDictionary.GetValue<string>(complianceResult, "extras"));
                 if (XDDictionary.GetValue<bool>(complianceResult, "success"))
                 {
                     await AgreementModule.SignAgreement(user.UserId);
@@ -256,7 +256,7 @@ namespace XD.SDK.Account.Internal.Standalone
             {
                 if ((e.HttpStatusCode == 401 && loginType == LoginType.Default) || e.Code == 40311 || e.Code == 40312)
                 {
-                    InternalLogout(false);
+                    InternalLogout("LOGOUT_API", false);
                 }
 
                 var errorMsg = e.Message;
@@ -273,27 +273,33 @@ namespace XD.SDK.Account.Internal.Standalone
             }
         }
 
-        internal static void InternalLogout(bool needNotify = true)
+        public void InternalLogout(string logoutType = "LOGOUT_API", bool needNotify = true, bool bShowAgreement = true)
         {
             // SDK 登陆成功
-            AliyunTrack.LoginLogout("LOGOUT_API");
+            AliyunTrack.LoginLogout(logoutType);
 
             XDGEventBus.Publish(XDGEvents.TdsSDKLogout);
             XDGEventBus.Publish(XDGEvents.TapSDKLogout);
-            XDGEventBus.Publish(XDGEvents.TapSDKComplianceExit, ConfigModule.IsGlobal);
-
+            if (logoutType != "SWITCH_ACCOUNT" && logoutType != "COMPLIANCE_EXIT")
+            {
+                XDGEventBus.Publish(XDGEvents.TapSDKComplianceExit, ConfigModule.IsGlobal);
+            }
+            
             ClearUserCache();
-            // 确认协议
-            _ = AgreementModule.ConfirmAgreement().ContinueWith(t =>
+
+            if (bShowAgreement)
             {
-                if (!t.IsFaulted)
+                _ = AgreementModule.ConfirmAgreement().ContinueWith(t =>
                 {
-                    if (needNotify)
+                    if (!t.IsFaulted)
                     {
-                        UserStatusChangeCallback?.Invoke(XDGUserStatusCodeType.ProtocolAgreedAfterLogout, null);
+                        if (needNotify)
+                        {
+                            UserStatusChangeCallback?.Invoke(XDGUserStatusCodeType.ProtocolAgreedAfterLogout, null);
+                        }
                     }
-                }
-            }, TaskScheduler.FromCurrentSynchronizationContext());
+                }, TaskScheduler.FromCurrentSynchronizationContext());
+            }
 
             if (needNotify)
             {
@@ -384,6 +390,7 @@ namespace XD.SDK.Account.Internal.Standalone
             {
                 XDGLogger.Warn($"[InvokeXdgPaymentCheckRefundStatusWithUI] Error:{e.Message}");
             }
+
             return user;
         }
 

package/Runtime/Internal/Standalone/Compliance/XDComplianceCode.cs

@@ -0,0 +1,15 @@
+namespace XD.SDK.Account.Standalone
+{
+    public enum XDComplianceCode
+    {
+        LoginSuccess = 500,
+        Exited = 1000,
+        SwitchAccount = 1001,
+        PeriodRestrict = 1030,
+        DurationLimit = 1050,
+        AgeLimit = 1100,
+        InvalidClientOrNetworkError = 1200,
+        RealNameStop = 9002
+    }
+
+}

package/Runtime/Internal/Standalone/Compliance/XDComplianceCode.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: ccaddacb01aa48f4bcaca69420b1a6fb
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/Runtime/Internal/Standalone/Compliance.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: a222155108264cc99220f4b5d789b3f0
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

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

@@ -19,7 +19,6 @@ namespace XD.SDK.Account.Internal.Standalone
 
         private SupportModule()
         {
-            StartCheckUnRead();
         }
 
         public static SupportModule Instance
@@ -39,13 +38,24 @@ namespace XD.SDK.Account.Internal.Standalone
             }
         }
 
-        public static readonly string XDG_SUPPORT_USER_UNREAD_CHECK = "api/support/v1/user/unread/check";
+        public void TryStartPolling()
+        {
+            if (!ConfigModule.CustomerDisable)
+            {
+                StartCheckUnRead();
+                return;
+            }
+
+            XDGLogger.Debug("XSupportManager is disabled by config, skipping polling start");
+        }
+
+        private const string XdgSupportUserUnreadCheck = "api/support/v1/user/unread/check";
 
-        public static readonly string XDG_SUPPORT_ANONYMOUS_UNREAD_CHECK = "api/support/v1/user/anonymous/unread/check";
+        private const string XdgSupportAnonymousUnreadCheck = "api/support/v1/user/anonymous/unread/check";
 
-        public static readonly string XDG_SUPPORT_USER_GET_URL = "api/support/v1/user/url/get";
+        private const string XdgSupportUserGetURL = "api/support/v1/user/url/get";
 
-        public static readonly string XDG_SUPPORT_ANONYMOUS_GET_URL = "api/support/v1/user/anonymous/url/get";
+        private const string XdgSupportAnonymousGetURL = "api/support/v1/user/anonymous/url/get";
 
         private int nextCheckUnreadTime = 10;
 
@@ -84,13 +94,29 @@ namespace XD.SDK.Account.Internal.Standalone
             });
         }
 
-        public static async void CheckUnRead()
+        private static async void CheckUnRead()
         {
             XDGLogger.Debug("Support check unread");
             try
             {
+                string requestUrl;
+                Dictionary<string, object> queryMap;
+                if (UserModule.GetCurrentUser() != null)
+                {
+                    requestUrl = XdgSupportUserUnreadCheck;
+                    queryMap = null;
+                }
+                else
+                {
+                    requestUrl = XdgSupportAnonymousUnreadCheck;
+                    queryMap = new Dictionary<string, object>()
+                    {
+                        { "anonymousId", SystemInfo.deviceUniqueIdentifier }
+                    };
+                }
+
                 var response = await XDHttpClient.Client.GetAsync<SupportBaseResponse<SupportUnReadResponse>>(
-                    UserModule.GetCurrentUser() != null ? XDG_SUPPORT_USER_UNREAD_CHECK : XDG_SUPPORT_ANONYMOUS_UNREAD_CHECK);
+                    requestUrl,null, queryMap);
 
                 var bHasUnRead = response.Data.HasUnread;
                 var bUnReadStatusChange = bHasUnRead != Instance.bLastHasRead;
@@ -113,13 +139,13 @@ namespace XD.SDK.Account.Internal.Standalone
             StartCheckUnRead();
         }
 
-        public static int IncreaseTimeInterval()
+        private static int IncreaseTimeInterval()
         {
             var currentInterval = Instance.nextCheckUnreadTime;
             return currentInterval >= 300 ? currentInterval : (currentInterval += 10);
         }
 
-        public static void StartCheckUnRead()
+        private static void StartCheckUnRead()
         {
             try
             {
@@ -146,12 +172,13 @@ namespace XD.SDK.Account.Internal.Standalone
                         XDGLogger.Warn($"Support Start CheckUnRead Action error:{e.Message}");
                     }
                 });
+                return;
             }
 
             CheckUnRead();
         }
 
-        public static async void RequestSupportUrl(XDGRoleInfo roleInfo, string path, Dictionary<string, object> extra, Action<bool, bool, string> action)
+        private static async void RequestSupportUrl(XDGRoleInfo roleInfo, string path, Dictionary<string, object> extra, Action<bool, bool, string> action)
         {
             XDGLogger.Debug("Support RequestSupportUrl");
             try
@@ -160,6 +187,7 @@ namespace XD.SDK.Account.Internal.Standalone
                 {
                     path = "";
                 }
+
                 if (extra == null)
                 {
                     extra = new Dictionary<string, object>();
@@ -184,8 +212,8 @@ namespace XD.SDK.Account.Internal.Standalone
                 };
 
                 var response = await XDHttpClient.Client.PostAsync<SupportBaseResponse<SupportUrlResponse>>(UserModule.current == null
-                    ? XDG_SUPPORT_ANONYMOUS_GET_URL
-                    : XDG_SUPPORT_USER_GET_URL, null, data, UserModule.current == null ? query : null);
+                    ? XdgSupportAnonymousGetURL
+                    : XdgSupportUserGetURL, null, data, UserModule.current == null ? query : null);
 
                 action.Invoke(true, response.Data.XD, response.Data.Url);
             }

package/Runtime/Internal/Standalone/UserCenterAlert.cs

@@ -303,7 +303,7 @@ namespace XD.SDK.Account.Standalone
                     UIManager.ShowToast(localizableString.UnbindDeleteSuccessReturnSign);
                     UIManager.DismissAll();
 
-                    AccountFeaturesImpl.InternalLogout();
+                    AccountFeaturesImpl.Instance.InternalLogout();
                 }
                 else
                 {
@@ -392,7 +392,7 @@ namespace XD.SDK.Account.Standalone
                 if (code == 1)
                 {
                     UIManager.DismissAll();
-                    AccountFeaturesImpl.InternalLogout();
+                    AccountFeaturesImpl.Instance.InternalLogout();
                 }
                 else
                 {

package/Runtime/Internal/XDGAccountEventHandler.cs

@@ -15,6 +15,8 @@ namespace XD.SDK.Account
             XDGEventBus.Subscribe(XDGEvents.AccountGetCurrentUser, _ => XDGAccount.GetCurrentUser());
 #if UNITY_EDITOR || UNITY_STANDALONE
             XDGEventBus.SubscribeAsync(XDGEvents.AccountGetAccessToken, async _ => await AccessTokenModule.GetLocalAccessToken());
+
+            XDGEventBus.Subscribe(XDGEvents.AccountSupportStartPolling, _ => SupportModule.Instance.TryStartPolling());
 #endif
         }
     }

package/package.json

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