com.xd.sdk.common 0.0.15-alpha → 0.0.16-alpha

package/Editor/XDGScriptHandlerProcessor.cs

@@ -36,7 +36,7 @@ namespace XD.SDK.Common.Editor
             int beginIndex = all.IndexOf(below, StringComparison.Ordinal);
             if (beginIndex == -1)
             {
-                Debug.LogWarning(filePath + "中没有找到字符串" + below);
+                Debug.LogError(filePath + "中没有找到字符串" + below);
                 return;
             }
 
@@ -72,7 +72,7 @@ namespace XD.SDK.Common.Editor
                 startIndex = all.IndexOf(start, startIndex + 1, StringComparison.Ordinal);
                 if (startIndex == -1)
                 {
-                    Debug.LogWarning(filePath + "中没有找到相邻的 start 和 end");
+                    Debug.LogError(filePath + "中没有找到相邻的 start 和 end");
                     return;
                 }
 

package/Editor/iOS/XDGIOSCommonProcessor.cs

@@ -670,16 +670,16 @@ namespace XD.SDK.Common.Editor
             UnityAppController.WriteBelow(@"#include <assert.h>", @"#import <XDCommonSDK/XDCommonSDK.h>");
 
             UnityAppController.WriteBelow(@"applicationDidFinishLaunching",
-                @"  [XDGSDK application:application didFinishLaunchingWithOptions:launchOptions];");
+                @"    [XDGSDK application:application didFinishLaunchingWithOptions:launchOptions];");
             UnityAppController.WriteBelow(@"AppController_SendNotificationWithArg(kUnityOnOpenURL, notifData);",
-                @"  [XDGSDK application:app openURL:url options:options];");
+                @"    [XDGSDK application:app openURL:url options:options];");
             UnityAppController.WriteBelow(@"AppController_SendNotificationWithArg(kUnityDidRegisterForRemoteNotificationsWithDeviceToken, deviceToken);", @"    [XDGSDK application:application didRegisterForRemoteNotificationsWithDeviceToken:deviceToken];");
-            UnityAppController.WriteBetween(@"UnitySendRemoteNotification(userInfo);", @"if (handler)", @"    [XDGSDK application:application didReceiveRemoteNotification:userInfo fetchCompletionHandler:NULL];");
-
+            UnityAppController.WriteBelow(@"didReceiveRemoteNotification:(NSDictionary *)userInfo fetchCompletionHandler:(void (^)(UIBackgroundFetchResult result))handler
+{","    [XDGSDK application:application didReceiveRemoteNotification:userInfo fetchCompletionHandler:handler];");
             if (CheckoutUniversalLinkHolder(unityAppControllerPath, @"NSURL* url = userActivity.webpageURL;"))
             {
                 UnityAppController.WriteBelow(@"NSURL* url = userActivity.webpageURL;",
-                    @"  [XDGSDK application:application continueUserActivity:userActivity restorationHandler:restorationHandler];");
+                    @"    [XDGSDK application:application continueUserActivity:userActivity restorationHandler:restorationHandler];");
             }
             else
             {

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

@@ -1,3 +1,32 @@
 fileFormatVersion: 2
 guid: 0a0110a88bdc4305b920b6b058daaa09
-timeCreated: 1751364758
+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/Android/libs/XDTapTapWrapper_7.0.0.aar.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 473fe5e458494a869ae123a50d44a2d1
+timeCreated: 1755746066

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

@@ -114,4 +114,3 @@ FOUNDATION_EXPORT const unsigned char XDCommonSDKVersionString[];
 #import <XDCommonSDK/XDGWebFunctionHolder.h>
 
 #import <XDCommonSDK/XDGTapSDK.h>
-#import <XDCommonSDK/XDGTapMoment.h>

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

@@ -34,21 +34,6 @@ NS_ASSUME_NONNULL_BEGIN
 
 + (BOOL)isPreApproved;
 
-/// moment
-+ (void)setMomentDelegate:(XDGCommonCodeMsgHandler)delegate;
-
-+ (void)fetchMomentNotification;
-
-+ (void)openMoment;
-
-+ (void)openMomentWithScene:(NSString *)sceneId;
-
-+ (void)closeMomentWithData:(NSDictionary *_Nullable)data;
-
-+ (void)publishMomentWithData:(NSDictionary *)data;
-
-+ (void)needDeferSystemGestures;
-
 /// support
 + (void)openSupportWeb:(NSString *)url
         viewController:(UIViewController *)viewController

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

@@ -7,4 +7,4 @@
 
 #define XDSDK_VERSION @"7.0.0"
 #define XDSDK_VERSION_CODE @"7000000"
-// HASH 8bd7e79
+// HASH 5925d9e

package/Plugins/iOS/XDCommonSDK.framework/XDResources.bundle/zh-Hant.lproj/Localizable.strings

@@ -42,14 +42,14 @@
 "tds_refund_login_restrict_title"= "暫時無法進入遊戲";
 "tds_refund_login_restrict_sub_title"= "將所有退款訂單補款完成後即可進入遊戲";
 "tds_refund_ios_pay_tip"= "您有剩餘退款訂單無法在此系統進行補款，需要使用iOS系統登錄遊戲後進行補款";
-"tds_pay_success"= "充值成功";
-"tds_pay_fail"= "充值失敗";
+"tds_pay_success"= "儲值成功";
+"tds_pay_fail"= "儲值失敗";
 "tds_pay_cancel"="已取消儲值";
 "tds_button_confirm"= "確認";
 "tds_promotion_exchange_title"= "領取商品";
 "tds_promotion_exchange_desc"= "你已經擁有該商品 ，是否發放給本角色";
 "tds_refund_android_pay_tip"= "您有剩餘退款訂單無法在此系統進行補款，需要使用Android系統登錄遊戲後進行補款";
-"tds_pay_net_fail"= "網路異常，充值失敗";
+"tds_pay_net_fail"= "網路異常，儲值失敗";
 "tds_refund_net_fail"= "網路異常，補款失敗";
 "tds_purchase_processing"= "該訂單正在處理中，請稍後";
 "tds_confirm_agreement"= "同意";

package/Plugins/iOS/XDTapSDK4WrapperSDK.framework/Headers/XDTapSDK4WrapperSDK.h

@@ -17,4 +17,4 @@ FOUNDATION_EXPORT const unsigned char XDTapSDK4WrapperSDKVersionString[];
 
 #define XDGTapSDK4_VERSION @"7.0.0"
 #define XDGTapSDK4_VERSION_CODE @"7000000"
-// HASH 8bd7e79
+// HASH 5925d9e

package/Runtime/Internal/Mobile/Bridge/BridgeAndroid.cs

@@ -22,8 +22,6 @@ namespace XD.SDK.Common.Internal.Mobile.Bridge
 
         private readonly AndroidJavaObject _mAndroidBridge;
 
-
-
         private static readonly BridgeAndroid SInstance = new BridgeAndroid();
         
         public static BridgeAndroid GetInstance()

package/Runtime/Internal/Mobile/Bridge/BridgeConstants.cs

@@ -45,6 +45,7 @@ namespace XD.SDK.Common.Internal.Mobile.Bridge
             public const string ServiceName = "com.xd.sdk.push.bridge.BridgePush";
             public const string ServiceImpl = "com.xd.sdk.push.bridge.BridgePushImpl";
         }
+        
     }
 }
 #endif

package/Runtime/Internal/Mobile/Bridge/EngineBridge.cs

@@ -109,8 +109,8 @@ namespace XD.SDK.Common.Internal.Mobile.Bridge
         }
 
 #if UNITY_IOS
-        [MonoPInvokeCallback(typeof(Action<string, string, string>))]
-        private static void CSharpFunctionHandler(string functionName, string jsonData, string callbackId)
+        [MonoPInvokeCallback(typeof(Action<string, string, string, bool>))]
+        private static void CSharpFunctionHandler(string functionName, string jsonData, string callbackId, bool onceTime)
         {
             MainThreadDispatcher.RunOnMainThread(() =>
             {
@@ -118,21 +118,21 @@ namespace XD.SDK.Common.Internal.Mobile.Bridge
                 {
                     if (!string.IsNullOrEmpty(callbackId))
                     {
-                        MainThreadDispatcher.RunOnMainThread(() =>
-                        {
-                            XDG_CompleteEngineCallback(callbackId, resultJson);
-                        });
+                        MainThreadDispatcher.RunOnMainThread(() => { XDG_CompleteEngineCallback(callbackId, resultJson, onceTime); });
                     }
                 });
             });
         }
 
         [DllImport("__Internal")]
-        private static extern void XDG_RegisterEngineFunction(Action<string, string, string> handler);
+        private static extern void XDG_RegisterEngineFunction(Action<string, string, string, bool> handler);
+
+        [DllImport("__Internal")]
+        private static extern void XDG_CompleteEngineCallback(string callbackId, string result, bool onceTime);
 
         [DllImport("__Internal")]
-        private static extern void XDG_CompleteEngineCallback(string callbackId, string result);
- 
+        private static extern void XDG_CancelEngineCallback(string callbackId);
+
         private void InitializeIOSEngineHandler()
         {
             try
@@ -146,12 +146,32 @@ namespace XD.SDK.Common.Internal.Mobile.Bridge
             }
         }
 #endif
+
+#if UNITY_IOS
+        public static void CancelEngineCallback(string callbackId)
+        {
+            if (string.IsNullOrEmpty(callbackId))
+            {
+                Debug.LogWarning("[EngineBridge] CancelEngineCallback called with empty callbackId");
+                return;
+            }
+
+            try
+            {
+                XDG_CancelEngineCallback(callbackId);
+            }
+            catch (Exception ex)
+            {
+                Debug.LogError($"[EngineBridge] CancelEngineCallback failed: {ex.Message}");
+            }
+        }
+#endif
         public async void HandleEngineFunction(string functionName, string jsonData, Action<string> callback)
         {
             try
             {
                 Debug.Log($"[EngineBridgeHelper] Handling function: {functionName} with data: {jsonData}");
-                
+
                 EngineHandler handler;
                 lock (engineFunctions)
                 {
@@ -216,13 +236,13 @@ namespace XD.SDK.Common.Internal.Mobile.Bridge
 
                 if (!IsValidArguments(args))
                 {
-                    Debug.LogError($"[AndroidEngineHandler] Invalid arguments count: {args?.Length ?? 0}, expected 3");
+                    Debug.LogError($"[AndroidEngineHandler] Invalid arguments count: {args?.Length ?? 0}, expected 4");
                     return null;
                 }
 
                 try
                 {
-                    var (functionName, dataString, callback) = ExtractArguments(args);
+                    var (functionName, dataString, callback, onceTime) = ExtractArguments(args);
 
                     if (string.IsNullOrEmpty(functionName))
                     {
@@ -231,7 +251,7 @@ namespace XD.SDK.Common.Internal.Mobile.Bridge
                         return null;
                     }
 
-                    Debug.Log($"[AndroidEngineHandler] Calling engine function: {functionName} with data: {dataString}");
+                    Debug.Log($"[AndroidEngineHandler] Calling engine function: {functionName} with data: {dataString}, onceTime={onceTime}");
 
                     // 使用主线程调度器确保HandleEngineFunction在主线程中执行
                     MainThreadDispatcher.RunOnMainThread(() =>
@@ -241,19 +261,12 @@ namespace XD.SDK.Common.Internal.Mobile.Bridge
                             try
                             {
                                 Debug.Log($"[AndroidEngineHandler] Engine function result: {resultJson}");
-                                // 回调也需要在主线程中执行，因为它可能调用Android JNI方法
-                                MainThreadDispatcher.RunOnMainThread(() =>
-                                {
-                                    InvokeCallback(callback, resultJson);
-                                });
+                                MainThreadDispatcher.RunOnMainThread(() => { InvokeCallback(callback, resultJson); });
                             }
                             catch (Exception ex)
                             {
                                 Debug.LogError($"[AndroidEngineHandler] Callback invocation failed: {ex.Message}");
-                                MainThreadDispatcher.RunOnMainThread(() =>
-                                {
-                                    InvokeCallback(callback, $"Callback error: {ex.Message}");
-                                });
+                                MainThreadDispatcher.RunOnMainThread(() => { InvokeCallback(callback, $"Callback error: {ex.Message}"); });
                             }
                         });
                     });
@@ -275,7 +288,6 @@ namespace XD.SDK.Common.Internal.Mobile.Bridge
                     try
                     {
                         callback.Call(OnResultMethod, result);
-                        Debug.Log($"[AndroidEngineHandler] Callback invoked successfully with result length: {result?.Length ?? 0}");
                     }
                     catch (Exception ex)
                     {
@@ -288,10 +300,33 @@ namespace XD.SDK.Common.Internal.Mobile.Bridge
                 }
             }
 
-            private static bool IsValidArguments(object[] args) => args?.Length == 3;
+            private static bool IsValidArguments(object[] args) => args?.Length == 4;
+
+            private static (string functionName, string dataString, AndroidJavaObject callback, bool onceTime) ExtractArguments(object[] args)
+            {
+                var functionName = args[0] as string;
+                var dataString = args[1] as string;
+                bool onceTime = false;
+                AndroidJavaObject callback = null;
+                try
+                {
+                    if (args[2] is bool b)
+                    {
+                        onceTime = b;
+                    }
+                    else if (args[2] is AndroidJavaObject jBool)
+                    {
+                        onceTime = jBool.Call<bool>("booleanValue");
+                    }
 
-            private static (string functionName, string dataString, AndroidJavaObject callback) ExtractArguments(object[] args) =>
-                (args[0] as string, args[1] as string, args[2] as AndroidJavaObject);
+                    callback = args[3] as AndroidJavaObject;
+                }
+                catch (Exception)
+                {
+                    
+                }
+                return (functionName, dataString, callback, onceTime);
+            }
         }
     }
 }

package/Runtime/Internal/Standalone/CommonFeaturesImpl.cs

@@ -206,13 +206,14 @@ namespace XD.SDK.Common.Internal.Standalone
             }
         }
 
-        private static void InitTap(XDGInitParam initParam)
+        private static async void InitTap(XDGInitParam initParam)
         {
             var tapConfig = ConfigModule.TapConfig;
 
-            XDGEventBus.Publish(XDGEvents.TapSDKInit,
+           await XDGEventBus.PublishAsync(XDGEvents.TapSDKInit,
                 tapConfig.ClientId,
                 tapConfig.ClientToken,
+                tapConfig.ClientPublicKey,
                 initParam.Lang.FormatToXDLangString(),
                 ConfigModule.IsGlobal,
                 true, // enableLog - TODO: 根据配置判断
@@ -223,6 +224,7 @@ namespace XD.SDK.Common.Internal.Standalone
             XDGEventBus.Publish(XDGEvents.TdsSDKInit, tapConfig.ClientId,
                 tapConfig.ClientToken,
                 tapConfig.ServerUrl);
+            
         }
 
         private static string GetChannel(string defaultChannel)

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "com.xd.sdk.common",
   "displayName": "XDGSDK Common",
-  "version": "0.0.15-alpha",
+  "version": "0.0.16-alpha",
   "description": "XDGSDK",
   "unity": "2019.3",
   "license": "MIT",
   "dependencies": {
-    "com.xd.sdk.foundation": "0.0.15-alpha"
+    "com.xd.sdk.foundation": "0.0.16-alpha"
   }
 }

package/Runtime/Internal/Standalone/Interfaces.meta

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