com.xd.sdk.common 7.0.1 → 7.0.2

package/Editor/iOS/XDGIOSCommonProcessor.cs

@@ -453,11 +453,13 @@ namespace XD.SDK.Common.Editor
                 plistArray.AddString(items[i]);
             }
 
-            foreach (var item in customPlistDic)
-            {
-                if (!item.Key.Equals("taptap"))
+            if (customPlistDic != null) {
+                foreach (var item in customPlistDic)
                 {
-                    _rootDic.SetString(item.Key, item.Value.ToString());
+                    if (!item.Key.Equals("taptap"))
+                    {
+                        _rootDic.SetString(item.Key, item.Value.ToString());
+                    }
                 }
             }
 

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

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 4ef4fde55809047faa517b09986f46fd
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

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

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: ce6d0f15960fc4be8a1436ea53f2dcb9
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

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

@@ -5,6 +5,6 @@
 //  Created by Fattycat on 2022/5/13.
 //
 
-#define XDSDK_VERSION @"7.0.1"
-#define XDSDK_VERSION_CODE @"7000010"
-// HASH 135a1142
+#define XDSDK_VERSION @"7.0.2"
+#define XDSDK_VERSION_CODE @"7000020"
+// HASH ed74f1fb

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

@@ -15,6 +15,6 @@ FOUNDATION_EXPORT const unsigned char XDTapSDK4WrapperSDKVersionString[];
 
 // In this header, you should import all the public headers of your framework using statements like #import <XDTapSDK4WrapperSDK/PublicHeader.h>
 
-#define XDGTapSDK4_VERSION @"7.0.1"
-#define XDGTapSDK4_VERSION_CODE @"7000010"
-// HASH 135a1142
+#define XDGTapSDK4_VERSION @"7.0.2"
+#define XDGTapSDK4_VERSION_CODE @"7000020"
+// HASH ed74f1fb

package/Plugins/iOS/XDTapSDK4WrapperSDK.framework/TapSupportResource.bundle/de.lproj/Localizable.strings.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: e98aeabd5f3914c4c9bd1d8406d2216d
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/Plugins/iOS/XDTapSDK4WrapperSDK.framework/TapSupportResource.bundle/de.lproj.meta

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

package/Plugins/iOS/XDTapSDK4WrapperSDK.framework/TapSupportResource.bundle/en.lproj/Localizable.strings.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: ac206b89036c748d5a9f9bbdc6bded9f
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/Plugins/iOS/XDTapSDK4WrapperSDK.framework/TapSupportResource.bundle/en.lproj.meta

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

package/Plugins/iOS/XDTapSDK4WrapperSDK.framework/TapSupportResource.bundle/es.lproj/Localizable.strings.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: cb52afbb338984700aa5f1295c9b3059
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/Plugins/iOS/XDTapSDK4WrapperSDK.framework/TapSupportResource.bundle/es.lproj.meta

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

package/Plugins/iOS/XDTapSDK4WrapperSDK.framework/TapSupportResource.bundle/fr.lproj/Localizable.strings.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: f2ee96b8d86284b7384d5500e40234b8
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/Plugins/iOS/XDTapSDK4WrapperSDK.framework/TapSupportResource.bundle/fr.lproj.meta

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

package/Plugins/iOS/XDTapSDK4WrapperSDK.framework/TapSupportResource.bundle/in.lproj/Localizable.strings.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 91b893f206e48436c9b271c9b7c20c6d
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/Plugins/iOS/XDTapSDK4WrapperSDK.framework/TapSupportResource.bundle/in.lproj.meta

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

package/Plugins/iOS/XDTapSDK4WrapperSDK.framework/TapSupportResource.bundle/ja.lproj/Localizable.strings.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: ef05134d355274a31a47de6178db3619
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/Plugins/iOS/XDTapSDK4WrapperSDK.framework/TapSupportResource.bundle/ja.lproj.meta

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

package/Plugins/iOS/XDTapSDK4WrapperSDK.framework/TapSupportResource.bundle/ko.lproj/Localizable.strings.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 4d86d18e772c64cb7b9f24ff7e28ad50
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/Plugins/iOS/XDTapSDK4WrapperSDK.framework/TapSupportResource.bundle/ko.lproj.meta

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

package/Plugins/iOS/XDTapSDK4WrapperSDK.framework/TapSupportResource.bundle/ms.lproj/Localizable.strings.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: a2832e3cbfda84c308988a507e7d8a3a
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/Plugins/iOS/XDTapSDK4WrapperSDK.framework/TapSupportResource.bundle/ms.lproj.meta

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

package/Plugins/iOS/XDTapSDK4WrapperSDK.framework/TapSupportResource.bundle/pt.lproj/Localizable.strings.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: c77150e272efa4f23b84a6b7dac4a124
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/Plugins/iOS/XDTapSDK4WrapperSDK.framework/TapSupportResource.bundle/pt.lproj.meta

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

package/Plugins/iOS/XDTapSDK4WrapperSDK.framework/TapSupportResource.bundle/ru.lproj/Localizable.strings.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: f3cde1eb2c9e644f285aa3ef9b58f7f8
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/Plugins/iOS/XDTapSDK4WrapperSDK.framework/TapSupportResource.bundle/ru.lproj.meta

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

package/Plugins/iOS/XDTapSDK4WrapperSDK.framework/TapSupportResource.bundle/th.lproj/Localizable.strings.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 54e8f1c03d55c4db79de2a69403a6e97
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/Plugins/iOS/XDTapSDK4WrapperSDK.framework/TapSupportResource.bundle/th.lproj.meta

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

package/Plugins/iOS/XDTapSDK4WrapperSDK.framework/TapSupportResource.bundle/tr.lproj/Localizable.strings.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: f894c7e4c2dab441fbb00aa670740388
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/Plugins/iOS/XDTapSDK4WrapperSDK.framework/TapSupportResource.bundle/tr.lproj.meta

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

package/Plugins/iOS/XDTapSDK4WrapperSDK.framework/TapSupportResource.bundle/vi.lproj/Localizable.strings.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: ccb9610e0120b4df4b6e19c61b5691ce
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/Plugins/iOS/XDTapSDK4WrapperSDK.framework/TapSupportResource.bundle/vi.lproj.meta

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

package/Plugins/iOS/XDTapSDK4WrapperSDK.framework/TapSupportResource.bundle/zh-Hans.lproj/Localizable.strings.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: abb9bc10de29341e09819954862c3c44
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/Plugins/iOS/XDTapSDK4WrapperSDK.framework/TapSupportResource.bundle/zh-Hans.lproj.meta

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

package/Plugins/iOS/XDTapSDK4WrapperSDK.framework/TapSupportResource.bundle/zh-Hant.lproj/Localizable.strings.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 6f2669b89c95c44b4851c4113490ac2a
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/Plugins/iOS/XDTapSDK4WrapperSDK.framework/TapSupportResource.bundle/zh-Hant.lproj.meta

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

package/Plugins/iOS/XDTapSDK4WrapperSDK.framework/TapSupportResource.bundle.meta

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

package/Resources/Prefabs/XDWebBridgeView.prefab

@@ -538,7 +538,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Color: {r: 1, g: 1, b: 1, a: 0}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1

package/Runtime/Internal/Standalone/CommonFeaturesImpl.cs

@@ -184,7 +184,7 @@ namespace XD.SDK.Common.Internal.Standalone
 
                 IPInfoModule.RequestIpInfoAndSave();
 
-                InitTap(param);
+                await InitTap(param);
 
                 //TODO 注册防沉迷回调
                 RegisterTapComplianceCallback();
@@ -206,12 +206,13 @@ namespace XD.SDK.Common.Internal.Standalone
             }
         }
 
-        private static async void InitTap(XDGInitParam initParam)
+        private static async Task InitTap(XDGInitParam initParam)
         {
             var tapConfig = ConfigModule.TapConfig;
 
             await XDGEventBus.PublishAsync(XDGEvents.TapSDKInit,
-                initParam.Lang.FormatToXDLangString());
+                initParam.Lang.FormatToXDLangString(),
+                initParam.PackageType);
 
             XDGEventBus.Publish(XDGEvents.TdsSDKInit, tapConfig.ClientId,
                 tapConfig.ClientToken,
@@ -237,7 +238,6 @@ namespace XD.SDK.Common.Internal.Standalone
             }
             catch (Exception e)
             {
-                
             }
         }
     }

package/Runtime/Internal/Standalone/Web/Function/BackgroundColorWebFunction.cs

@@ -17,7 +17,7 @@ namespace XD.SDK.Common.Internal.Standalone
         public void Handler(IBridgeWebView webView, string data, Action<object> callbackFunction)
         {
             XDGLogger.Debug($"message from javascript by:{GetName()} with data:{data}");
-            webView.ProviderWebTrans().Transparent(GetName(), data);
+            webView.ProviderWebTrans()?.Transparent(GetName(), data);
         }
     }
 }

package/Runtime/Internal/Standalone/Web/Function/CloseVisibleWebFunction.cs

@@ -16,7 +16,7 @@ namespace XD.SDK.Common.Internal.Standalone
         public void Handler(IBridgeWebView webView, string data, Action<object> callbackFunction)
         {
             XDGLogger.Debug($"message from javascript by:{GetName()} with data:{data}");
-            webView.ProviderWebTrans().Transparent(Tag, data);
+            webView.ProviderWebTrans()?.Transparent(Tag, data);
         }
     }
 }

package/Runtime/Internal/Standalone/Web/Function/CloseWebFunction.cs

@@ -16,12 +16,9 @@ namespace XD.SDK.Common.Internal.Standalone
         {
             XDGLogger.Debug($"message from javascript by:{GetName()} with data:{data}");
             var dic = JsonConvert.DeserializeObject<Dictionary<string, object>>(data);
-            dic.TryGetValue("extra", out var extra);
-            callbackFunction?.Invoke(new WebBridgeResponse.Success
-            {
-                Data = extra
-            });
+            webView.ProviderWebTrans()?.TransObserver(WebActionEnum.CLOSE, dic);
             UIManager.Dismiss();
+            webView.Release();
         }
     }
 }

package/Runtime/Internal/Standalone/Web/Function/GameMessageWebFunction.cs

@@ -16,7 +16,7 @@ namespace XD.SDK.Common.Internal.Standalone
         {
             XDGLogger.Debug("GameMessageWebFunction.Handler()");
             var dic = JsonConvert.DeserializeObject<Dictionary<string, object>>(data);
-            webView.ProviderWebTrans().TransObserver(WebActionEnum.MESSAGE, dic);
+            webView.ProviderWebTrans()?.TransObserver(WebActionEnum.MESSAGE, dic);
         }
     }
 }

package/Runtime/Internal/Standalone/Web/Function/NavigationWebFunction.cs

@@ -16,7 +16,7 @@ namespace XD.SDK.Common.Internal.Standalone
         public void Handler(IBridgeWebView webView, string data, Action<object> callbackFunction)
         {
             XDGLogger.Debug($"message from javascript by:{GetName()} with data:{data}");
-            webView.ProviderWebTrans().Transparent(GetName(), data);
+            webView.ProviderWebTrans()?.Transparent(GetName(), data);
         }
     }
 }

package/Runtime/Internal/Standalone/Web/WebBridgeController.cs

@@ -34,39 +34,46 @@ namespace XD.SDK.Common.Internal.Standalone
 
         private void OnMessageEmitted()
         {
-            webView.MessageEmitted += (_, args) =>
+            try
             {
-                try
+                webView.MessageEmitted += (_, args) =>
                 {
-                    if (!IsWhiteList())
-                    {
-                        XDGLogger.Debug($"WebBridgeController OnMessageEmitted 白名单校验失败");
-                        return;
-                    }
-
-                    var content = DecodeBase64String(args.Value);
-                    var dic = JsonConvert.DeserializeObject<Dictionary<string, object>>(content);
-                    if (dic == null)
+                    try
                     {
-                        XDGLogger.Debug($"WebBridgeController OnMessageEmitted 解析 jsBridge 参数失败");
-                        return;
+                        if (!IsWhiteList())
+                        {
+                            XDGLogger.Debug($"WebBridgeController OnMessageEmitted 白名单校验失败");
+                            return;
+                        }
+
+                        var content = DecodeBase64String(args.Value);
+                        var dic = JsonConvert.DeserializeObject<Dictionary<string, object>>(content);
+                        if (dic == null)
+                        {
+                            XDGLogger.Debug($"WebBridgeController OnMessageEmitted 解析 jsBridge 参数失败");
+                            return;
+                        }
+
+                        if (dic.TryGetValue("responseId", out var responseId))
+                        {
+                            DispatchResponse(responseId as string, dic["responseData"]);
+                            return;
+                        }
+
+                        dic.TryGetValue("handlerName", out var handlerName);
+                        dic.TryGetValue("callbackId", out var callbackId);
+                        DispatchHandler(handlerName as string, callbackId as string, dic["data"]);
                     }
-
-                    if (dic.TryGetValue("responseId", out var responseId))
+                    catch (Exception e)
                     {
-                        DispatchResponse(responseId as string, dic["responseData"]);
-                        return;
+                        XDGLogger.Debug(e.Message);
                     }
-
-                    dic.TryGetValue("handlerName", out var handlerName);
-                    dic.TryGetValue("callbackId", out var callbackId);
-                    DispatchHandler(handlerName as string, callbackId as string, dic["data"]);
-                }
-                catch (Exception e)
-                {
-                    XDGLogger.Debug(e.Message);
-                }
-            };
+                };
+            }
+            catch (Exception e)
+            {
+                XDGLogger.Debug(e.Message);
+            }
         }
 
         public void RegisterHandler(IWebFunction handler)

package/Runtime/Internal/Standalone/Web/XDWebBridgeView.cs

@@ -88,8 +88,15 @@ namespace XD.SDK.Common.Internal.Standalone
 
         private void OnDestroy()
         {
-            canvasWebViewPrefab.Destroy();
-            webBridgeController.Release();
+            try
+            {
+                webBridgeController?.Release();
+                canvasWebViewPrefab?.Destroy();
+            }
+            catch (Exception e)
+            {
+                XDGLogger.Warn(e.Message);
+            }
         }
 
         private async void OnBackButtonClicked()
@@ -167,7 +174,7 @@ namespace XD.SDK.Common.Internal.Standalone
 
             if (loading)
             {
-                UIManager.ShowLoading();
+                UIManager.ShowLoading(false, 5);
             }
         }
 

package/package.json

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