From 86e95c15e3c92088269a73edad66fa5ccc1977e3 Mon Sep 17 00:00:00 2001 From: zhangjie0072 Date: Tue, 9 Aug 2022 14:35:45 +0800 Subject: [PATCH] fix dy android --- Assets/Editor/StarkBuilderSetting.asset | 4 +- .../Common/GameInterface/TKGSDKManager.cs | 8 +- .../Scripts/SDK/TKGNativeInterface.cs | 58 +++++---- .../Scripts/SDK/TKGNativeInterfaceWebgl.cs | 117 ++++-------------- 4 files changed, 62 insertions(+), 125 deletions(-) diff --git a/Assets/Editor/StarkBuilderSetting.asset b/Assets/Editor/StarkBuilderSetting.asset index 8b3c565b..0bfde427 100644 --- a/Assets/Editor/StarkBuilderSetting.asset +++ b/Assets/Editor/StarkBuilderSetting.asset @@ -14,8 +14,8 @@ MonoBehaviour: m_EditorClassIdentifier: a: 0 b: 0 - c: - d: + c: tt48073ebad739259407 + d: out_apk_chicken e: 2 f: 1 g: 0 diff --git a/Assets/TKGSDK/Common/GameInterface/TKGSDKManager.cs b/Assets/TKGSDK/Common/GameInterface/TKGSDKManager.cs index 6a1aa6c0..21423caa 100644 --- a/Assets/TKGSDK/Common/GameInterface/TKGSDKManager.cs +++ b/Assets/TKGSDK/Common/GameInterface/TKGSDKManager.cs @@ -3,13 +3,13 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; using Touka; -using StarkSDKSpace; #if H5_WX using WeChatWASM; #endif #if H5_DY +using StarkSDKSpace; using StarkSDKSpace.UNBridgeLib.LitJson; #endif @@ -648,6 +648,7 @@ public class TKGSDKManager : TKGSingleton #elif H5_WX return WayOfReward.Share; #endif + return WayOfReward.RewardAd; } public void ShareShareAppMessageByType(ShareType _shareType = ShareType.ShareAppOriginImg) @@ -770,6 +771,7 @@ public class TKGSDKManager : TKGSingleton /// public void ScreenRecordingLogic(SCLCategory sCLCategory, string title, List topics, System.Action actA = null) { +#if H5_DY string platform = StarkSDK.API.GetSystemInfo().platform; if (platform != null && platform.ToLower().Contains("ios")) { @@ -817,6 +819,7 @@ public class TKGSDKManager : TKGSingleton default: break; } +#endif } public enum SCLCategory @@ -829,6 +832,7 @@ public class TKGSDKManager : TKGSingleton public void ShareNormalImg() { +#if H5_DY int tipIndex = GetRandomIndex(); string imgUrl = string.Format("{0}ShareImg/ShareImg{1}.png", cdnPath, (tipIndex + 1)); JsonData shareJson = new JsonData(); @@ -849,7 +853,7 @@ public class TKGSDKManager : TKGSingleton }, shareJson); - +#endif } #endregion diff --git a/Assets/TKGSDK/NativeSDK/Scripts/SDK/TKGNativeInterface.cs b/Assets/TKGSDK/NativeSDK/Scripts/SDK/TKGNativeInterface.cs index 447a2cc5..caa5ae2d 100644 --- a/Assets/TKGSDK/NativeSDK/Scripts/SDK/TKGNativeInterface.cs +++ b/Assets/TKGSDK/NativeSDK/Scripts/SDK/TKGNativeInterface.cs @@ -22,7 +22,11 @@ namespace Touka #if UNITY_EDITOR || UNITY_STANDLONE _instance = new TKGNativeInterfaceWebgl(); #elif UNITY_ANDROID - _instance = new TKGNativeInterfaceAndroid(); + #if H5_DY + _instance = new TKGNativeInterfaceWebgl(); + #else + _instance = new TKGNativeInterfaceAndroid(); + #endif #elif UNITY_IOS _instance = new TKGNativeInterfaceIOS(); #elif UNITY_WEBGL @@ -63,14 +67,14 @@ namespace Touka /// public abstract string GetChannel(); - #region Ads +#region Ads public abstract void PurchasedRemoveAds(); public abstract void SetUnitySDKVersion(string sdkVersion); - #region Ads Show +#region Ads Show public abstract void RemoveNativeAd(); @@ -126,9 +130,9 @@ namespace Touka /// public abstract void showVideoAd(string _adPos, int _itemCount = -1); - #endregion +#endregion - #region Ads isready +#region Ads isready /// /// banner isReady @@ -155,9 +159,9 @@ namespace Touka public abstract bool isVideoAdReady(); - #endregion +#endregion - #region Set Ads callback +#region Set Ads callback /// /// Set Banner Ad Callback @@ -184,9 +188,9 @@ namespace Touka public abstract void setVideoAdCallback(AndroidInterADTKGAdCallback _videoCallback); - #endregion +#endregion - #region load ads +#region load ads /// /// load interstitial ad @@ -206,14 +210,14 @@ namespace Touka /// public abstract void loadVideoAD(); - #endregion +#endregion - #endregion +#endregion - #region Log Event +#region Log Event - #region Normal +#region Normal /// /// onEvent @@ -249,9 +253,9 @@ namespace Touka /// public abstract void onEvent(string _eventName, Dictionary _keyValues); - #endregion +#endregion - #region Level Event +#region Level Event /// /// Level Start @@ -266,9 +270,9 @@ namespace Touka /// public abstract void LevelEnd(string _levelId, StageResult _stageResult); - #endregion +#endregion - #region Tracking Event +#region Tracking Event /// /// Log Tracking Event @@ -276,11 +280,11 @@ namespace Touka /// public abstract void LogTrackingEvent(TrackingEventType _eventType); - #endregion +#endregion - #endregion +#endregion - #region Online Config +#region Online Config /// /// get config - int @@ -305,9 +309,9 @@ namespace Touka /// public abstract bool GetConfigBool(string _key, bool _default); - #endregion +#endregion - #region Others (Common) +#region Others (Common) /// /// review @@ -335,9 +339,9 @@ namespace Touka /// public abstract void OpenMoreGame(); - #endregion +#endregion - #region Others (Uncommon) +#region Others (Uncommon) /// /// shake(no repeat) @@ -428,9 +432,9 @@ namespace Touka /// /// notification identifier public abstract void RemoveNotification(string notiId); - #endregion +#endregion - #region other callback +#region other callback /// /// set tkg common callback @@ -442,6 +446,6 @@ namespace Touka /// public abstract void SetUserSourceCallback(AndroidTKGUserSourceCalllback _userSourceCallback); - #endregion +#endregion } } \ No newline at end of file diff --git a/Assets/TKGSDK/NativeSDK/Scripts/SDK/TKGNativeInterfaceWebgl.cs b/Assets/TKGSDK/NativeSDK/Scripts/SDK/TKGNativeInterfaceWebgl.cs index 998f9747..c18e1a7b 100644 --- a/Assets/TKGSDK/NativeSDK/Scripts/SDK/TKGNativeInterfaceWebgl.cs +++ b/Assets/TKGSDK/NativeSDK/Scripts/SDK/TKGNativeInterfaceWebgl.cs @@ -1,4 +1,4 @@ -#if UNITY_WEBGL +#if UNITY_WEBGL || H5_DY using System; using System.Collections; @@ -54,13 +54,13 @@ namespace Touka public override void Init(Action _initCallback = null) { TKGDebugger.LogDebug("init ----- 00"); - SetBannerAdCallback(new AndroidBannerADTKGAdCallback()); - TKGDebugger.LogDebug("init ----- 01 ------- a"); - setInterstitalAdCallback(new AndroidInterADTKGAdCallback()); - TKGDebugger.LogDebug("init ----- 01 ------- b"); - SetRewardAdCallback(new AndroidRewardADTKGAdCallback()); - TKGDebugger.LogDebug("init ----- 01 ------- c"); - SetSDKCommonCallback(new AndroidTKGCommonCalllback()); + //SetBannerAdCallback(new AndroidBannerADTKGAdCallback()); + //TKGDebugger.LogDebug("init ----- 01 ------- a"); + //setInterstitalAdCallback(new AndroidInterADTKGAdCallback()); + //TKGDebugger.LogDebug("init ----- 01 ------- b"); + //SetRewardAdCallback(new AndroidRewardADTKGAdCallback()); + //TKGDebugger.LogDebug("init ----- 01 ------- c"); + //SetSDKCommonCallback(new AndroidTKGCommonCalllback()); TKGDebugger.LogDebug("init ----- 01 ------- d"); #if H5_WX @@ -427,34 +427,19 @@ namespace Touka /// public override void showVideoAd(string _adPos, int _itemCount = -1) { -#if UNITY_ANDROID - SDKCall("showVideoAd", _adPos, _itemCount); -#endif + } public override void ShowNativeAd(RectTransform pRect, Camera pCam = null, string pAdPos = "") { -#if UNITY_ANDROID - Vector3[] tWorldCorners = new Vector3[4]; - pRect.GetWorldCorners(tWorldCorners); - Vector2 tTopLeft = RectTransformUtility.WorldToScreenPoint(pCam, tWorldCorners[1]); - Vector2 tBottomRight = RectTransformUtility.WorldToScreenPoint(pCam, tWorldCorners[3]); - float tWidth = Mathf.Abs(tBottomRight.x - tTopLeft.x); - float tHeight = Mathf.Abs(tBottomRight.y - tTopLeft.y); - // x , y , width , height - // ((tTopLeft.x, Screen.height - tTopLeft.y, tWidth, tHeight) - SDKCall("showNative", pAdPos, tTopLeft.x, Screen.height - tTopLeft.y, tWidth, tHeight, pAdPos); -#endif } public override void RemoveNativeAd() { -#if UNITY_ANDROID - SDKCall("hideNative"); -#endif + } #endregion @@ -467,13 +452,7 @@ namespace Touka /// public override bool isBannerAdReady() { - -#if UNITY_ANDROID - bool isReady = SDKCall("isBannerAdReady"); - return isReady; -#else return false; -#endif } /// @@ -482,12 +461,7 @@ namespace Touka /// public override bool isInterstitialAdReady() { -#if UNITY_ANDROID - bool isReady = SDKCall("isInterstitialAdReady"); - return isReady; -#else return false; -#endif } /// @@ -496,13 +470,7 @@ namespace Touka /// public override bool isRewardAdReady() { - -#if UNITY_ANDROID - bool isReady = SDKCall("isRewardAdReady"); - return isReady; -#else return false; -#endif } /// @@ -511,22 +479,12 @@ namespace Touka /// public override bool isVideoAdReady() { -#if UNITY_ANDROID - bool isReady = SDKCall("isVideoAdReady"); - return isReady; -#else return false; -#endif } public override bool IsReadyNativeAd() { -#if UNITY_ANDROID - bool isReady = SDKCall("isNativeReady"); - return isReady; -#else return false; -#endif } #endregion @@ -539,9 +497,7 @@ namespace Touka /// public override void SetBannerAdCallback(AndroidBannerADTKGAdCallback _bannerCallback) { -#if UNITY_ANDROID - SDKCall("setBannerAdCallback", _bannerCallback); -#endif + } /// @@ -550,9 +506,7 @@ namespace Touka /// public override void setInterstitalAdCallback(AndroidInterADTKGAdCallback _interCallback) { -#if UNITY_ANDROID - SDKCall("setInterstitalAdCallback", _interCallback); -#endif + } /// @@ -561,9 +515,7 @@ namespace Touka /// public override void SetRewardAdCallback(AndroidRewardADTKGAdCallback _rewardCallback) { -#if UNITY_ANDROID - SDKCall("setRewardAdCallback", _rewardCallback); -#endif + } @@ -574,9 +526,6 @@ namespace Touka public override void setVideoAdCallback(AndroidInterADTKGAdCallback _videoCallback) { -#if UNITY_ANDROID - SDKCall("setVideoAdCallback", _videoCallback); -#endif } #endregion @@ -589,9 +538,7 @@ namespace Touka /// public override void loadInterstitialAD() { -#if UNITY_ANDROID - SDKCall("loadInterstitialAD"); -#endif + } /// @@ -600,9 +547,7 @@ namespace Touka /// public override void loadRewardAD() { -#if UNITY_ANDROID - SDKCall("loadRewardAD"); -#endif + } /// @@ -611,9 +556,7 @@ namespace Touka /// public override void loadVideoAD() { -#if UNITY_ANDROID - SDKCall("loadVideoAD"); -#endif + } #endregion @@ -632,9 +575,7 @@ namespace Touka /// public override void onEvent(string _eventName) { -#if UNITY_ANDROID - SDKCall("onEvent", _eventName); -#endif + } /// @@ -646,9 +587,7 @@ namespace Touka /// public override void onEvent(string _eventName, string _key01, string _value01) { -#if UNITY_ANDROID - SDKCall("onEvent", _eventName, _key01, _value01); -#endif + } /// @@ -662,9 +601,7 @@ namespace Touka /// public override void onEvent(string _eventName, string _key01, string _value01, string _key02, string _value02) { -#if UNITY_ANDROID - SDKCall("onEvent", _eventName, _key01, _value01, _key02, _value02); -#endif + } /// @@ -674,9 +611,7 @@ namespace Touka /// public override void onEvent(string _eventName, Dictionary _keyValues) { -#if UNITY_ANDROID - SDKCall("onEvent", _eventName, Analytics.ToJavaHashMap(_keyValues)); -#endif + } #endregion @@ -689,9 +624,7 @@ namespace Touka /// public override void LevelStart(string _levelId) { -#if UNITY_ANDROID - SDKCall("levelStart", _levelId); -#endif + } /// @@ -701,9 +634,7 @@ namespace Touka /// public override void LevelEnd(string _levelId, StageResult _stageResult) { -#if UNITY_ANDROID - SDKCall("levelEnd", _levelId, (int)_stageResult); -#endif + } #endregion @@ -716,9 +647,7 @@ namespace Touka /// public override void LogTrackingEvent(TrackingEventType _eventType) { -#if UNITY_ANDROID - SDKCall("LogTrackingEvent", (int)_eventType); -#endif + } #endregion