com.xd.sdk.common 6.29.5 → 6.31.1

package/Editor/XDGCommonGradleContextProvider.cs

@@ -29,6 +29,7 @@ namespace XD.SDK.Common.Editor
         private const string OkHttp = "    implementation \"com.squareup.okhttp3:okhttp:4.7.2\"";
         private const string Okio = "    implementation \"com.squareup.okio:okio:2.6.0\"";
         private const string ZXing = "    implementation \"com.google.zxing:core:3.5.3\"";
+        private const string LocalBroadcastManager = "    implementation \"androidx.localbroadcastmanager:localbroadcastmanager:1.0.0\"";
 
         private const string ANDROIDX = "android.useAndroidX=true";
         private const string ANDROID_JET = "android.enableJetifier=true";
@@ -47,6 +48,7 @@ namespace XD.SDK.Common.Editor
             GSON_DEP,
             KOTLIN_DEP,
             ADX_COMPAT_DEP,
+            LocalBroadcastManager,
             RETROFIT2,
             RETROFIT2_RX,
             RETROFIT2_CONVERTER,

package/Mobile/Plugins/iOS/XDGTrackUnityBridge.mm

@@ -0,0 +1,32 @@
+#import <Foundation/Foundation.h>
+#if __has_include(<XDCommonSDK/XDGCoreService.h>)
+#import <XDCommonSDK/XDGCloudLogHelper.h>
+#else
+#import "XDGCoreService.h"
+#endif
+
+extern "C" const char* XDGCoreService_logCommonEvent(const char *propertiesJson) {
+@autoreleasepool {
+NSString *jsonString = propertiesJson ? [NSString stringWithUTF8String:propertiesJson] : nil;
+
+if (jsonString == nil) {
+return nil;
+}
+NSData *jsonData = [jsonString dataUsingEncoding:NSUTF8StringEncoding];
+NSError *err;
+NSDictionary *dic = [NSJSONSerialization JSONObjectWithData:jsonData
+options:NSJSONReadingMutableContainers
+error:&err];
+if (err) {
+return nil;
+}
+
+NSString *result = [XDGCloudLogHelper logCommonEvent:dic];
+if (result == nil) {
+result = @"";
+}
+const char *utf8 = [result UTF8String];
+char *ret = strdup(utf8 ? utf8 : "");
+return ret;
+}
+}

package/Mobile/Plugins/iOS/XDGTrackUnityBridge.mm.meta

@@ -0,0 +1,42 @@
+fileFormatVersion: 2
+guid: 53a58dc1e660049a7b0cc6c860f67d10
+PluginImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  iconMap: {}
+  executionOrder: {}
+  defineConstraints: []
+  isPreloaded: 0
+  isOverridable: 0
+  isExplicitlyReferenced: 0
+  validateReferences: 1
+  platformData:
+  - first:
+      Any: 
+    second:
+      enabled: 0
+      settings: {}
+  - first:
+      Editor: Editor
+    second:
+      enabled: 0
+      settings:
+        DefaultValueInitialized: true
+  - first:
+      VisionOS: VisionOS
+    second:
+      enabled: 1
+      settings: {}
+  - first:
+      iPhone: iOS
+    second:
+      enabled: 1
+      settings: {}
+  - first:
+      tvOS: tvOS
+    second:
+      enabled: 1
+      settings: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/Mobile/XDGCommonMobile.cs

@@ -143,6 +143,11 @@ namespace  XD.SDK.Common {
         {
             XDGCommonMobileImpl.GetInstance().PreloadWebPage(url);
         }
+        
+        public string GetPackageType()
+        {
+            return XDGPackageType.PackageTypeDefault;
+        }
 
         private void SetGameActivity()
         {

package/Mobile/XDGCommonMobileImpl.cs

@@ -606,6 +606,6 @@ namespace  XD.SDK.Common{
                 .CommandBuilder();
             EngineBridge.GetInstance().CallHandler(command);
         }
-        
+
     }
 }

package/Mobile/XDGTrackMobileImpl.cs

@@ -0,0 +1,44 @@
+using System.Collections.Generic;
+using UnityEngine;
+using System.Runtime.InteropServices;
+using LC.Newtonsoft.Json;
+
+namespace XD.SDK.Common
+{
+    public class XDGTrackMobileImpl : IXDGTracker
+    {
+        public string LogCommonEvent(Dictionary<string, string> properties)
+        {
+#if UNITY_ANDROID
+            using (AndroidJavaClass clz = new AndroidJavaClass("com.xd.intl.common.tracker.aliyun.CloudLogHelper")) {
+                AndroidJavaObject map = null;
+                if (properties != null && properties.Count > 0)
+                {
+                    map = new AndroidJavaObject("java.util.HashMap");
+                    foreach (var kv in properties)
+                    {
+                        var key = kv.Key ?? string.Empty;
+                        var val = kv.Value ?? string.Empty;
+                        map.Call<AndroidJavaObject>("put", key, val);
+                    }
+                }
+                return clz.CallStatic<string>("logEvent", map);
+            }
+#elif UNITY_IOS
+            string json = null;
+            if (properties != null && properties.Count > 0)
+            {
+                json = JsonConvert.SerializeObject(properties);
+            }
+            System.IntPtr ret = XDGCoreService_logCommonEvent(json);
+            return Marshal.PtrToStringAnsi(ret);
+#else
+            throw new System.NotImplementedException();
+#endif
+        }
+
+#if UNITY_IOS
+        [DllImport("__Internal")] private static extern System.IntPtr XDGCoreService_logCommonEvent(string propertiesJson);
+#endif
+    }
+}

package/Mobile/XDGTrackMobileImpl.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 98cac68f91e54588b0af74e96e2ef8c9
+timeCreated: 1762933234

package/Plugins/iOS/XDCommonSDK.framework/Headers/XDGCloudLogHelper.h

@@ -26,6 +26,8 @@ NS_ASSUME_NONNULL_BEGIN
 + (NSString *)gameLaunchTime;
 
 + (NSString *)getTapDBDeviceID;
+
++ (NSString *)logCommonEvent:(NSDictionary *)properties;
 @end
 
 NS_ASSUME_NONNULL_END

package/Plugins/iOS/XDCommonSDK.framework/Headers/XDVersion.h

@@ -5,6 +5,6 @@
 //  Created by Fattycat on 2022/5/13.
 //
 
-#define XDSDK_VERSION @"6.29.3"
-#define XDSDK_VERSION_CODE @"6029030"
-// HASH 6ccd542
+#define XDSDK_VERSION @"6.31.0"
+#define XDSDK_VERSION_CODE @"6031000"
+// HASH 13f77e9f

package/Runtime/Internal/Http/XDGHost.cs

@@ -10,6 +10,8 @@ namespace XD.SDK.Common.Internal
         public static readonly string BASE_HOST_CN_ROLLBACK = "https://xdsdk-cn-prod-gateway2.xd.cn";
         public static readonly string BASE_HOST_GLOBAL_DEFAULT = "https://xdsdk-os-prod-gateway.xd.com";
         public static readonly string BASE_HOST_GLOBAL_ROLLBACK = "https://xdsdk-os-prod-gateway2.xd.com";
+        public static readonly string XD_PERSONAL_INFO_CN = "https://accounts.xd.cn";
+        public static readonly string XD_PERSONAL_INFO_IO = "https://accounts.xd.com";
     }
     /*
      * 管理多个域名，通过 权重（weight）和 默认顺序（defaultOrder）来决定优先级

package/Runtime/Internal/IXDGCommon.cs

@@ -64,5 +64,7 @@ namespace XD.SDK.Common
         void OpenWebPage(string url, Action<WebActionEnum, Dictionary<string, object>> callback);
         
         void PreloadWebPage(string url);
+        
+        string GetPackageType();
     }
 }

package/Runtime/Internal/IXDGTracker.cs

@@ -0,0 +1 @@
+using System.Collections.Generic;
    public interface IXDGTracker
    {
        string LogCommonEvent(Dictionary<string, string> properties);
    }

package/Runtime/Internal/IXDGTracker.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 7f4a025e26de4022a90e767d1b76ba80
+timeCreated: 1762932760

package/Runtime/Public/XDGInitParam.cs

@@ -8,19 +8,19 @@ namespace XD.SDK.Common
         public const string PackageTypeDefault = "Default";
 
         // App Store 包
-        public const string PackageTypeAppStore = "AppStore";
+        // public const string PackageTypeAppStore = "AppStore";
 
         // 普通 Android 包
-        public const string PackageTypeAndroidNormal = "Android-Normal";
+        // public const string PackageTypeAndroidNormal = "Android-Normal";
 
         // GooglePlay 包
-        public const string PackageTypeAndroidGooglePlay = "Android-GooglePlay";
+        // public const string PackageTypeAndroidGooglePlay = "Android-GooglePlay";
 
         // TapTap 国内包
-        public const string PackageTypeAndroidTapTap = "Android-TapTap";
+        // public const string PackageTypeAndroidTapTap = "Android-TapTap";
 
         // TapTap 海外包
-        public const string PackageTypeAndroidTapIO = "Android-TapIO";
+        // public const string PackageTypeAndroidTapIO = "Android-TapIO";
 
         // 普通 PC 包
         public const string PackageTypePCNormal = "PC-Normal";

package/Runtime/Public/XDGTracker.cs

@@ -0,0 +1 @@
+using System;
    public class XDGTracker
    {
        private static readonly IXDGTracker platformWrapper;
        static XDGTracker()
        {
            var interfaceType = typeof(IXDGTracker);
            var platformInterfaceType = AppDomain.CurrentDomain.GetAssemblies()
                .SelectMany(assembly => assembly.GetTypes())
                .FirstOrDefault(clazz => interfaceType.IsAssignableFrom(clazz) && clazz.IsClass);
            if (platformInterfaceType != null)
            {
                platformWrapper = Activator.CreateInstance(platformInterfaceType) as IXDGTracker;
            }
            else
            {
                TapLogger.Error($"No class implements {interfaceType} Type. Current Platform: {Application.platform}, if you are using Editor, please check if you have installed XDSDK pc module.");
            }
        }
        public static string LogCommonEvent(Dictionary<string, string> properties)
        {
            return platformWrapper?.LogCommonEvent(properties);
        }
    }

package/Runtime/Public/XDGTracker.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: e1626c3e0ddc479cbfb8d8e3af1ebd29
+timeCreated: 1762932797

package/Runtime/XDGCommon.cs

@@ -252,5 +252,18 @@ namespace XD.SDK.Common
         {
             platformWrapper.PreloadWebPage(url);
         }
+        
+        /// <summary>
+        /// 获取当前包体类型
+        /// 仅在 PC 平台可用
+        /// 1. 当 Steam SDK 启用时，优先返回 XDGPackageType.PackageTypePCSteam
+        /// 2. 当 TapTap 平台启用时，返回 XDGPackageType.PackageTypePCTapTap
+        /// 3. 否则返回默认 XDGPackageType.PackageTypePCNormal
+        /// </summary>
+        /// <returns>包体类型</returns>
+        public static string GetPackageType()
+        {
+            return platformWrapper.GetPackageType();
+        }
     }
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "com.xd.sdk.common",
   "displayName": "XDSDK Common",
-  "version": "6.29.5",
+  "version": "6.31.1",
   "description": "XDSDK",
   "unity": "2018.3",
   "license": "MIT",