fix dy android

This commit is contained in:
zhangjie0072 2022-08-09 14:35:45 +08:00
parent 1af6269aef
commit 86e95c15e3
4 changed files with 62 additions and 125 deletions

View File

@ -14,8 +14,8 @@ MonoBehaviour:
m_EditorClassIdentifier: m_EditorClassIdentifier:
a: 0 a: 0
b: 0 b: 0
c: c: tt48073ebad739259407
d: d: out_apk_chicken
e: 2 e: 2
f: 1 f: 1
g: 0 g: 0

View File

@ -3,13 +3,13 @@ using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
using UnityEngine; using UnityEngine;
using Touka; using Touka;
using StarkSDKSpace;
#if H5_WX #if H5_WX
using WeChatWASM; using WeChatWASM;
#endif #endif
#if H5_DY #if H5_DY
using StarkSDKSpace;
using StarkSDKSpace.UNBridgeLib.LitJson; using StarkSDKSpace.UNBridgeLib.LitJson;
#endif #endif
@ -648,6 +648,7 @@ public class TKGSDKManager : TKGSingleton<TKGSDKManager>
#elif H5_WX #elif H5_WX
return WayOfReward.Share; return WayOfReward.Share;
#endif #endif
return WayOfReward.RewardAd;
} }
public void ShareShareAppMessageByType(ShareType _shareType = ShareType.ShareAppOriginImg) public void ShareShareAppMessageByType(ShareType _shareType = ShareType.ShareAppOriginImg)
@ -770,6 +771,7 @@ public class TKGSDKManager : TKGSingleton<TKGSDKManager>
/// </summary> /// </summary>
public void ScreenRecordingLogic(SCLCategory sCLCategory, string title, List<string> topics, System.Action actA = null) public void ScreenRecordingLogic(SCLCategory sCLCategory, string title, List<string> topics, System.Action actA = null)
{ {
#if H5_DY
string platform = StarkSDK.API.GetSystemInfo().platform; string platform = StarkSDK.API.GetSystemInfo().platform;
if (platform != null && platform.ToLower().Contains("ios")) if (platform != null && platform.ToLower().Contains("ios"))
{ {
@ -817,6 +819,7 @@ public class TKGSDKManager : TKGSingleton<TKGSDKManager>
default: default:
break; break;
} }
#endif
} }
public enum SCLCategory public enum SCLCategory
@ -829,6 +832,7 @@ public class TKGSDKManager : TKGSingleton<TKGSDKManager>
public void ShareNormalImg() public void ShareNormalImg()
{ {
#if H5_DY
int tipIndex = GetRandomIndex(); int tipIndex = GetRandomIndex();
string imgUrl = string.Format("{0}ShareImg/ShareImg{1}.png", cdnPath, (tipIndex + 1)); string imgUrl = string.Format("{0}ShareImg/ShareImg{1}.png", cdnPath, (tipIndex + 1));
JsonData shareJson = new JsonData(); JsonData shareJson = new JsonData();
@ -849,7 +853,7 @@ public class TKGSDKManager : TKGSingleton<TKGSDKManager>
}, },
shareJson); shareJson);
#endif
} }
#endregion #endregion

View File

@ -22,7 +22,11 @@ namespace Touka
#if UNITY_EDITOR || UNITY_STANDLONE #if UNITY_EDITOR || UNITY_STANDLONE
_instance = new TKGNativeInterfaceWebgl(); _instance = new TKGNativeInterfaceWebgl();
#elif UNITY_ANDROID #elif UNITY_ANDROID
_instance = new TKGNativeInterfaceAndroid(); #if H5_DY
_instance = new TKGNativeInterfaceWebgl();
#else
_instance = new TKGNativeInterfaceAndroid();
#endif
#elif UNITY_IOS #elif UNITY_IOS
_instance = new TKGNativeInterfaceIOS(); _instance = new TKGNativeInterfaceIOS();
#elif UNITY_WEBGL #elif UNITY_WEBGL
@ -63,14 +67,14 @@ namespace Touka
/// <returns></returns> /// <returns></returns>
public abstract string GetChannel(); public abstract string GetChannel();
#region Ads #region Ads
public abstract void PurchasedRemoveAds(); public abstract void PurchasedRemoveAds();
public abstract void SetUnitySDKVersion(string sdkVersion); public abstract void SetUnitySDKVersion(string sdkVersion);
#region Ads Show #region Ads Show
public abstract void RemoveNativeAd(); public abstract void RemoveNativeAd();
@ -126,9 +130,9 @@ namespace Touka
/// <param name="_itemCount"></param> /// <param name="_itemCount"></param>
public abstract void showVideoAd(string _adPos, int _itemCount = -1); public abstract void showVideoAd(string _adPos, int _itemCount = -1);
#endregion #endregion
#region Ads isready #region Ads isready
/// <summary> /// <summary>
/// banner isReady /// banner isReady
@ -155,9 +159,9 @@ namespace Touka
public abstract bool isVideoAdReady(); public abstract bool isVideoAdReady();
#endregion #endregion
#region Set Ads callback #region Set Ads callback
/// <summary> /// <summary>
/// Set Banner Ad Callback /// Set Banner Ad Callback
@ -184,9 +188,9 @@ namespace Touka
public abstract void setVideoAdCallback(AndroidInterADTKGAdCallback _videoCallback); public abstract void setVideoAdCallback(AndroidInterADTKGAdCallback _videoCallback);
#endregion #endregion
#region load ads #region load ads
/// <summary> /// <summary>
/// load interstitial ad /// load interstitial ad
@ -206,14 +210,14 @@ namespace Touka
/// </summary> /// </summary>
public abstract void loadVideoAD(); public abstract void loadVideoAD();
#endregion #endregion
#endregion #endregion
#region Log Event #region Log Event
#region Normal #region Normal
/// <summary> /// <summary>
/// onEvent /// onEvent
@ -249,9 +253,9 @@ namespace Touka
/// <param name="_keyValues"></param> /// <param name="_keyValues"></param>
public abstract void onEvent(string _eventName, Dictionary<string, string> _keyValues); public abstract void onEvent(string _eventName, Dictionary<string, string> _keyValues);
#endregion #endregion
#region Level Event #region Level Event
/// <summary> /// <summary>
/// Level Start /// Level Start
@ -266,9 +270,9 @@ namespace Touka
/// <param name="_stageResult"></param> /// <param name="_stageResult"></param>
public abstract void LevelEnd(string _levelId, StageResult _stageResult); public abstract void LevelEnd(string _levelId, StageResult _stageResult);
#endregion #endregion
#region Tracking Event #region Tracking Event
/// <summary> /// <summary>
/// Log Tracking Event /// Log Tracking Event
@ -276,11 +280,11 @@ namespace Touka
/// <param name="_eventType"></param> /// <param name="_eventType"></param>
public abstract void LogTrackingEvent(TrackingEventType _eventType); public abstract void LogTrackingEvent(TrackingEventType _eventType);
#endregion #endregion
#endregion #endregion
#region Online Config #region Online Config
/// <summary> /// <summary>
/// get config - int /// get config - int
@ -305,9 +309,9 @@ namespace Touka
/// <returns></returns> /// <returns></returns>
public abstract bool GetConfigBool(string _key, bool _default); public abstract bool GetConfigBool(string _key, bool _default);
#endregion #endregion
#region Others (Common) #region Others (Common)
/// <summary> /// <summary>
/// review /// review
@ -335,9 +339,9 @@ namespace Touka
/// </summary> /// </summary>
public abstract void OpenMoreGame(); public abstract void OpenMoreGame();
#endregion #endregion
#region Others (Uncommon) #region Others (Uncommon)
/// <summary> /// <summary>
/// shake(no repeat) /// shake(no repeat)
@ -428,9 +432,9 @@ namespace Touka
/// </summary> /// </summary>
/// <param name="notiId">notification identifier</param> /// <param name="notiId">notification identifier</param>
public abstract void RemoveNotification(string notiId); public abstract void RemoveNotification(string notiId);
#endregion #endregion
#region other callback #region other callback
/// <summary> /// <summary>
/// set tkg common callback /// set tkg common callback
@ -442,6 +446,6 @@ namespace Touka
/// </summary> /// </summary>
public abstract void SetUserSourceCallback(AndroidTKGUserSourceCalllback _userSourceCallback); public abstract void SetUserSourceCallback(AndroidTKGUserSourceCalllback _userSourceCallback);
#endregion #endregion
} }
} }

View File

@ -1,4 +1,4 @@
#if UNITY_WEBGL #if UNITY_WEBGL || H5_DY
using System; using System;
using System.Collections; using System.Collections;
@ -54,13 +54,13 @@ namespace Touka
public override void Init(Action _initCallback = null) public override void Init(Action _initCallback = null)
{ {
TKGDebugger.LogDebug("init ----- 00"); TKGDebugger.LogDebug("init ----- 00");
SetBannerAdCallback(new AndroidBannerADTKGAdCallback()); //SetBannerAdCallback(new AndroidBannerADTKGAdCallback());
TKGDebugger.LogDebug("init ----- 01 ------- a"); //TKGDebugger.LogDebug("init ----- 01 ------- a");
setInterstitalAdCallback(new AndroidInterADTKGAdCallback()); //setInterstitalAdCallback(new AndroidInterADTKGAdCallback());
TKGDebugger.LogDebug("init ----- 01 ------- b"); //TKGDebugger.LogDebug("init ----- 01 ------- b");
SetRewardAdCallback(new AndroidRewardADTKGAdCallback()); //SetRewardAdCallback(new AndroidRewardADTKGAdCallback());
TKGDebugger.LogDebug("init ----- 01 ------- c"); //TKGDebugger.LogDebug("init ----- 01 ------- c");
SetSDKCommonCallback(new AndroidTKGCommonCalllback()); //SetSDKCommonCallback(new AndroidTKGCommonCalllback());
TKGDebugger.LogDebug("init ----- 01 ------- d"); TKGDebugger.LogDebug("init ----- 01 ------- d");
#if H5_WX #if H5_WX
@ -427,34 +427,19 @@ namespace Touka
/// <param name="_itemCount"></param> /// <param name="_itemCount"></param>
public override void showVideoAd(string _adPos, int _itemCount = -1) 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 = "") 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() public override void RemoveNativeAd()
{ {
#if UNITY_ANDROID
SDKCall("hideNative");
#endif
} }
#endregion #endregion
@ -467,13 +452,7 @@ namespace Touka
/// <returns></returns> /// <returns></returns>
public override bool isBannerAdReady() public override bool isBannerAdReady()
{ {
#if UNITY_ANDROID
bool isReady = SDKCall<bool>("isBannerAdReady");
return isReady;
#else
return false; return false;
#endif
} }
/// <summary> /// <summary>
@ -482,12 +461,7 @@ namespace Touka
/// <returns></returns> /// <returns></returns>
public override bool isInterstitialAdReady() public override bool isInterstitialAdReady()
{ {
#if UNITY_ANDROID
bool isReady = SDKCall<bool>("isInterstitialAdReady");
return isReady;
#else
return false; return false;
#endif
} }
/// <summary> /// <summary>
@ -496,13 +470,7 @@ namespace Touka
/// <returns></returns> /// <returns></returns>
public override bool isRewardAdReady() public override bool isRewardAdReady()
{ {
#if UNITY_ANDROID
bool isReady = SDKCall<bool>("isRewardAdReady");
return isReady;
#else
return false; return false;
#endif
} }
/// <summary> /// <summary>
@ -511,22 +479,12 @@ namespace Touka
/// <returns></returns> /// <returns></returns>
public override bool isVideoAdReady() public override bool isVideoAdReady()
{ {
#if UNITY_ANDROID
bool isReady = SDKCall<bool>("isVideoAdReady");
return isReady;
#else
return false; return false;
#endif
} }
public override bool IsReadyNativeAd() public override bool IsReadyNativeAd()
{ {
#if UNITY_ANDROID
bool isReady = SDKCall<bool>("isNativeReady");
return isReady;
#else
return false; return false;
#endif
} }
#endregion #endregion
@ -539,9 +497,7 @@ namespace Touka
/// <param name="_bannerCallback"></param> /// <param name="_bannerCallback"></param>
public override void SetBannerAdCallback(AndroidBannerADTKGAdCallback _bannerCallback) public override void SetBannerAdCallback(AndroidBannerADTKGAdCallback _bannerCallback)
{ {
#if UNITY_ANDROID
SDKCall("setBannerAdCallback", _bannerCallback);
#endif
} }
/// <summary> /// <summary>
@ -550,9 +506,7 @@ namespace Touka
/// <param name="_interCallback"></param> /// <param name="_interCallback"></param>
public override void setInterstitalAdCallback(AndroidInterADTKGAdCallback _interCallback) public override void setInterstitalAdCallback(AndroidInterADTKGAdCallback _interCallback)
{ {
#if UNITY_ANDROID
SDKCall("setInterstitalAdCallback", _interCallback);
#endif
} }
/// <summary> /// <summary>
@ -561,9 +515,7 @@ namespace Touka
/// <param name="_rewardCallback"></param> /// <param name="_rewardCallback"></param>
public override void SetRewardAdCallback(AndroidRewardADTKGAdCallback _rewardCallback) 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) public override void setVideoAdCallback(AndroidInterADTKGAdCallback _videoCallback)
{ {
#if UNITY_ANDROID
SDKCall("setVideoAdCallback", _videoCallback);
#endif
} }
#endregion #endregion
@ -589,9 +538,7 @@ namespace Touka
/// </summary> /// </summary>
public override void loadInterstitialAD() public override void loadInterstitialAD()
{ {
#if UNITY_ANDROID
SDKCall("loadInterstitialAD");
#endif
} }
/// <summary> /// <summary>
@ -600,9 +547,7 @@ namespace Touka
/// </summary> /// </summary>
public override void loadRewardAD() public override void loadRewardAD()
{ {
#if UNITY_ANDROID
SDKCall("loadRewardAD");
#endif
} }
/// <summary> /// <summary>
@ -611,9 +556,7 @@ namespace Touka
/// </summary> /// </summary>
public override void loadVideoAD() public override void loadVideoAD()
{ {
#if UNITY_ANDROID
SDKCall("loadVideoAD");
#endif
} }
#endregion #endregion
@ -632,9 +575,7 @@ namespace Touka
/// <returns></returns> /// <returns></returns>
public override void onEvent(string _eventName) public override void onEvent(string _eventName)
{ {
#if UNITY_ANDROID
SDKCall("onEvent", _eventName);
#endif
} }
/// <summary> /// <summary>
@ -646,9 +587,7 @@ namespace Touka
/// <returns></returns> /// <returns></returns>
public override void onEvent(string _eventName, string _key01, string _value01) public override void onEvent(string _eventName, string _key01, string _value01)
{ {
#if UNITY_ANDROID
SDKCall("onEvent", _eventName, _key01, _value01);
#endif
} }
/// <summary> /// <summary>
@ -662,9 +601,7 @@ namespace Touka
/// <returns></returns> /// <returns></returns>
public override void onEvent(string _eventName, string _key01, string _value01, string _key02, string _value02) 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
} }
/// <summary> /// <summary>
@ -674,9 +611,7 @@ namespace Touka
/// <param name="_keyValues"></param> /// <param name="_keyValues"></param>
public override void onEvent(string _eventName, Dictionary<string, string> _keyValues) public override void onEvent(string _eventName, Dictionary<string, string> _keyValues)
{ {
#if UNITY_ANDROID
SDKCall("onEvent", _eventName, Analytics.ToJavaHashMap(_keyValues));
#endif
} }
#endregion #endregion
@ -689,9 +624,7 @@ namespace Touka
/// <param name="_levelId"></param> /// <param name="_levelId"></param>
public override void LevelStart(string _levelId) public override void LevelStart(string _levelId)
{ {
#if UNITY_ANDROID
SDKCall("levelStart", _levelId);
#endif
} }
/// <summary> /// <summary>
@ -701,9 +634,7 @@ namespace Touka
/// <param name="_stageResult"></param> /// <param name="_stageResult"></param>
public override void LevelEnd(string _levelId, StageResult _stageResult) public override void LevelEnd(string _levelId, StageResult _stageResult)
{ {
#if UNITY_ANDROID
SDKCall("levelEnd", _levelId, (int)_stageResult);
#endif
} }
#endregion #endregion
@ -716,9 +647,7 @@ namespace Touka
/// <param name="_eventType"></param> /// <param name="_eventType"></param>
public override void LogTrackingEvent(TrackingEventType _eventType) public override void LogTrackingEvent(TrackingEventType _eventType)
{ {
#if UNITY_ANDROID
SDKCall("LogTrackingEvent", (int)_eventType);
#endif
} }
#endregion #endregion