diff --git a/External Cocos Helper Android Frameworks/Frameworks/Amazon/AmazonAds.java b/External Cocos Helper Android Frameworks/Frameworks/Amazon/AmazonAds.java index 183b37d..5fcc4b0 100644 --- a/External Cocos Helper Android Frameworks/Frameworks/Amazon/AmazonAds.java +++ b/External Cocos Helper Android Frameworks/Frameworks/Amazon/AmazonAds.java @@ -1,12 +1,10 @@ -package sonar.systems.frameworks.amazon; +package sonar.systems.frameworks.Amazon; /** * Written by: Oscar Leif */ -import android.app.ActionBar; import android.app.Activity; -import android.os.Bundle; import android.util.Log; import android.view.Gravity; import android.view.View; @@ -27,30 +25,23 @@ public class AmazonAds extends Framework { + private static final String LOG_TAG = "Amazon Ads Plugin"; // Tag used to prefix all log messages. + public static boolean interstitialAdLoaded = false; private static AmazonAds instance = null; + private static String APP_KEY = ""; // Your Amazon Ads Key ID private Activity activity; - private static String APP_KEY = ""; // Sample Application Key. Replace this value with your Application Key. - private static final String LOG_TAG = "Amazon Ads Plugin"; // Tag used to prefix all log messages. - - private ViewGroup adViewContainer; // View group to which the ad view will - // be added. - private AdLayout adView = null; // The ad that is currently visible to the - // user. + private ViewGroup adViewContainer; // View group to which the ad view will be added. + private AdLayout adView = null; // The ad that is currently visible to the user. private InterstitialAd interstitialAd; + private boolean IsInitialized = false; - private boolean isInitizalided = false; - - public static boolean interstitialAdLoaded = false; public AmazonAds() { - if (instance == null) - { - try - { + if (instance == null) { + try { throw new Exception("Object already exist"); - } catch (Exception e) - { + } catch (Exception e) { e.printStackTrace(); } } @@ -58,56 +49,72 @@ public AmazonAds() public static AmazonAds getInstance() throws Exception { - if (instance == null) - { + if (instance == null) { instance = new AmazonAds(); } return instance; } + //Call this first From Cocos via JNI public void SetActivity(Activity activity) { this.activity = activity; - instance = this; + this.instance = this; //TODO Update this the Key should be passed from C++ it will protect the Key - - InitializeAds(); - } - - @Override - public void onCreate(Bundle b) - { - super.onCreate(b); + this.Init(); } - private void InitializeAds() + private void Init() { - APP_KEY = "42e4f418e79c4ce1960f9de6ef14bbbd";//activity.getResources().getString(activity.getResources().getIdentifier("amazon_ads_key", "string", activity.getPackageName())); - //APP_KEY = "sample-app-v1_pub-2"; + APP_KEY = "sample-app-v1_pub-2"; AdLayout adLayout = new AdLayout(activity); //adLayout.setTimeout(15000); // 20 seconds This is optionally by Default is 10000 AdRegistration.enableLogging(true); - // For debugging purposes flag all ad requests as tests, but set to - // false for production builds. AdRegistration.enableTesting(true); AdRegistration.setAppKey(APP_KEY); - isInitizalided = true; - this.adViewContainer = (FrameLayout) activity.findViewById(android.R.id.content); - //this.interstitialAd = new InterstitialAd(activity); - //this.interstitialAd.setListener(new InterstitialsAdListener()); + this.IsInitialized = true; + //this.createBanner(); } + // Create a Banner public void createBanner() { + // Check if the plugin is initialized + if (!IsInitialized) { + //Log.d(tag, "Amazon Ad plugin is not initialized yet!"); + return; + } + final AmazonAds self = this; + // Create the ad view just once + if (adView == null) { + // Run the thread on Unity activity + activity.runOnUiThread( + new Runnable() + { + public void run() + { + adViewContainer = self.adViewContainer; + adView = new AdLayout(activity, AdSize.SIZE_AUTO_NO_SCALE); + final ViewGroup.LayoutParams layoutParams = new FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, + ViewGroup.LayoutParams.WRAP_CONTENT, Gravity.BOTTOM | Gravity.CENTER); + adView.setLayoutParams(layoutParams); + adView.setListener(new BannerAdListener()); + + adViewContainer.addView(adView); + refresh(); + } + }); + } else { + refresh(); + } } @Override public void HideBannerAd() { - if (adView == null) - { + if (adView == null) { return; } activity.runOnUiThread(new Runnable() @@ -123,45 +130,23 @@ public void run() @Override public void ShowBannerAd() { - super.ShowBannerAd(); // showCurrentAd(); - if (!isInitizalided) - { + if (!this.IsInitialized) { Log.d(LOG_TAG, "Amazon Ads plugin is not initialized yet!"); return; } - if (adView == null) - { - activity.runOnUiThread(new Runnable() - { - - @Override - public void run() - { - - adView = new AdLayout(activity, AdSize.SIZE_AUTO_NO_SCALE); - adView.setListener(new CustomAdListener()); - final android.widget.FrameLayout.LayoutParams layoutParams = new FrameLayout.LayoutParams(ActionBar.LayoutParams.MATCH_PARENT, ActionBar.LayoutParams.WRAP_CONTENT, Gravity.BOTTOM | Gravity.CENTER_HORIZONTAL); - activity.addContentView(adView, layoutParams); - AdTargetingOptions adOptions = new AdTargetingOptions(); - adView.loadAd(adOptions); - //adView.startAnimation(slideUp); - adView.setVisibility(View.VISIBLE); - } - }); - } else - { + if (adView == null) { + createBanner(); + } else { refresh(); } } // Refresh banner for a new ad request - //TODO Check this refresh method public void refresh() { - if (adView != null) - { + if (adView != null) { Log.d(LOG_TAG, "Refreshing Amazon Ad banner."); // Run the thread on Unity activity @@ -170,19 +155,13 @@ public void refresh() { public void run() { + adView.setVisibility(View.VISIBLE); AdTargetingOptions adOptions = new AdTargetingOptions(); adView.loadAd(adOptions); - if (adView.getVisibility() == View.INVISIBLE) - { - adView.setVisibility(View.VISIBLE); - //adView.startAnimation(slideUp); - return; - } } }); - } else - { - Log.d("Amazon Ads", "Amazon Ad plugin is not initialized yet!"); + } else { + Log.d(LOG_TAG, "Amazon Ad plugin is not initialized yet!"); } } @@ -192,8 +171,7 @@ public void HideBannerAd(int position) { super.HideBannerAd(position); //return if there's no ad view - if (adView == null) - { + if (adView == null) { return; } @@ -202,8 +180,7 @@ public void HideBannerAd(int position) @Override public void run() { - if (adView != null) - { + if (adView != null) { adView.setVisibility(View.GONE); } } @@ -222,10 +199,8 @@ public void ShowFullscreenAd() public void run() { requestInterstital(); - if (interstitialAd != null) - { - if (AmazonAds.interstitialAdLoaded) - { + if (interstitialAd != null) { + if (AmazonAds.interstitialAdLoaded) { interstitialAd.showAd(); AmazonAds.interstitialAdLoaded = false; } @@ -235,7 +210,7 @@ public void run() } - // Request interstitials + // Request interstitial public void requestInterstital() { activity.runOnUiThread(new Runnable() @@ -245,23 +220,19 @@ public void run() { boolean shouldRequest = true; - if (interstitialAd != null) - { - if (interstitialAd.isLoading()) - { + if (interstitialAd != null) { + if (interstitialAd.isLoading()) { shouldRequest = false; } - if (AmazonAds.interstitialAdLoaded) - { + if (AmazonAds.interstitialAdLoaded) { shouldRequest = false; } } - if (shouldRequest) - { - Log.d("Amazon Ads", "Requesting Amazon Interstitials"); + if (shouldRequest) { + Log.d("Amazon Ads", "Requesting Amazon Interstitial"); interstitialAd = new com.amazon.device.ads.InterstitialAd(activity); - interstitialAd.setListener(new InterstitialsAdListener()); + interstitialAd.setListener(new InterstitialAdListener()); AdTargetingOptions adOptions = new AdTargetingOptions(); interstitialAd.loadAd(adOptions); } @@ -276,26 +247,20 @@ public void run() public void onDestroy() { super.onDestroy(); - if (this.adView != null) - { + if (this.adView != null) { this.adView.destroy(); this.adView = null; } } - /** - * Shows the ad that is in the current ad view to the user. - */ - private void showCurrentAd() - { - this.adViewContainer.addView(this.adView); - } + + //region Banner Ad Listener /** * This class is for an event listener that tracks ad life cycle events. It extends DefaultAdListener, so you can override * only the methods that you need. This event is called once an ad loads successfully. onAdLoaded. */ - class CustomAdListener extends DefaultAdListener + private class BannerAdListener extends DefaultAdListener { @Override public void onAdLoaded(final Ad ad, final AdProperties adProperties) @@ -303,13 +268,6 @@ public void onAdLoaded(final Ad ad, final AdProperties adProperties) Log.i(LOG_TAG, adProperties.getAdType().toString() + " ad loaded successfully."); // If there is an ad currently being displayed, swap the ad that just loaded with current ad. // Otherwise simply display the ad that just loaded. - if (adView != null) - { - - } else - { - - } } /** @@ -319,6 +277,12 @@ public void onAdLoaded(final Ad ad, final AdProperties adProperties) public void onAdFailedToLoad(final Ad ad, final AdError error) { Log.w(LOG_TAG, "Ad failed to load. Code: " + error.getCode() + ", Message: " + error.getMessage()); + + if (error.getCode() == AdError.ErrorCode.NO_FILL) { + + } else if (error.getCode() == AdError.ErrorCode.INTERNAL_ERROR) { + + } } /** @@ -341,9 +305,10 @@ public void onAdCollapsed(final Ad ad) // Resume your activity here, if it was paused in onAdExpanded. } } + //endregion - // Interstitials ad listener - private class InterstitialsAdListener extends DefaultAdListener + //region Interstitial AdListener + private class InterstitialAdListener extends DefaultAdListener { /** * This event is called once an ad loads successfully. @@ -351,8 +316,7 @@ private class InterstitialsAdListener extends DefaultAdListener @Override public void onAdLoaded(final Ad ad, final AdProperties adProperties) { - //UnityPlayer.UnitySendMessage(UnityObjName, "OnAdEvent", "amazon-interstitial-yes"); - //AdsPlugin.interstitialAdLoaded = true; + } /** @@ -361,8 +325,7 @@ public void onAdLoaded(final Ad ad, final AdProperties adProperties) @Override public void onAdFailedToLoad(final Ad view, final AdError error) { - //UnityPlayer.UnitySendMessage(UnityObjName, "OnAdEvent", "amazon-interstitial-no");\ - //AdsPlugin.interstitialAdLoaded = false; + } /** @@ -371,11 +334,11 @@ public void onAdFailedToLoad(final Ad view, final AdError error) @Override public void onAdDismissed(final Ad ad) { - try - { + try { AmazonAds.getInstance().requestInterstital(); + } catch (Exception e) { } - catch (Exception e){ } } } + //endregion } diff --git a/External Cocos Helper Android Frameworks/Frameworks/Amazon/AmazonGameCircles.java b/External Cocos Helper Android Frameworks/Frameworks/Amazon/AmazonGameCircles.java index dc6406b..7786e56 100644 --- a/External Cocos Helper Android Frameworks/Frameworks/Amazon/AmazonGameCircles.java +++ b/External Cocos Helper Android Frameworks/Frameworks/Amazon/AmazonGameCircles.java @@ -1,24 +1,17 @@ -package sonar.systems.frameworks.amazon; +package sonar.systems.frameworks.Amazon; /** * Written by: Oscar Leif - *

- * WARNING: Don't use Android 6 has target it will make this crash */ import android.app.Activity; -import android.os.Bundle; import android.util.Log; -import android.widget.Toast; -import com.amazon.ags.api.AGResponseCallback; import com.amazon.ags.api.AGResponseHandle; import com.amazon.ags.api.AmazonGamesCallback; import com.amazon.ags.api.AmazonGamesClient; import com.amazon.ags.api.AmazonGamesFeature; import com.amazon.ags.api.AmazonGamesStatus; -import com.amazon.ags.api.achievements.AchievementsClient; -import com.amazon.ags.api.achievements.UpdateProgressResponse; import com.amazon.ags.api.leaderboards.LeaderboardsClient; import com.amazon.ags.api.leaderboards.SubmitScoreResponse; @@ -28,194 +21,135 @@ public class AmazonGameCircles extends Framework { - public static AmazonGameCircles instance; - private Activity activity; - private AmazonGamesClient agsClient; - private LeaderboardsClient lbClient; - private boolean gameServicesAvaliable; - - public AmazonGameCircles() - { - if (instance == null) - { - try - { - throw new Exception("Object already exist"); - } catch (Exception e) - { - e.printStackTrace(); - } - } - } - - public static AmazonGameCircles getInstance() throws Exception - { - if (instance == null) - { - instance = new AmazonGameCircles(); - } - return instance; - } + public static String TAG = "Game Circles Plugin"; - AmazonGamesCallback callback = new AmazonGamesCallback() + private Activity mainActivity; + private AmazonGamesClient agsClient; + private AmazonGamesCallback callbackListener = new AmazonGamesCallback() { @Override - public void onServiceReady(AmazonGamesClient arg0) + public void onServiceReady(AmazonGamesClient amazonGamesClient) { - agsClient = arg0; - gameServicesAvaliable = true; + agsClient = amazonGamesClient; + Log.d(TAG, "Amazon Games Client is Ready"); } @Override - public void onServiceNotReady(AmazonGamesStatus arg0) + public void onServiceNotReady(AmazonGamesStatus amazonGamesStatus) { - gameServicesAvaliable = false; + agsClient = null; + Log.d(TAG, "Amazon Games Client is not ready"); } }; - EnumSet myGameFeatures = EnumSet.of(AmazonGamesFeature.Achievements, AmazonGamesFeature.Leaderboards); + private EnumSet myGameFeatures = EnumSet.of(AmazonGamesFeature.Achievements,AmazonGamesFeature.Leaderboards); + //Must First Call this From Cocos2d-x @Override public void SetActivity(Activity activity) { - this.activity = activity; - instance = this; - } - - @Override - public void onCreate(Bundle b) - { - super.onCreate(b); + super.SetActivity(activity); + this.mainActivity = activity; } @Override public void onResume() { super.onResume(); - AmazonGamesClient.initialize(activity, callback, myGameFeatures); + AmazonGamesClient.initialize(this.mainActivity, callbackListener, myGameFeatures); } @Override public void onPause() { super.onPause(); - if (agsClient != null) + if(this.agsClient!=null) { - AmazonGamesClient.release(); + this.agsClient.release(); } } @Override - public void submitScoreAmazon(String leaderboardID, int score) + public void showLeaderboardsAmazon() { - super.submitScore(leaderboardID, score); - Log.e("Oscar JNI", "SubmitScore Works"); - if (gameServicesAvaliable == true) + super.showLeaderboardsAmazon(); + if(this.agsClient!=null) { - Log.d("AmazonGameCircle", "Sending LeaderboardID: " + leaderboardID + "with this score: " + Long.toString(score)); - LeaderboardsClient lbClient = agsClient.getLeaderboardsClient(); - AGResponseHandle handle = lbClient.submitScore(leaderboardID, score); - - // Optional callback to receive notification of success/failure - handle.setCallback(new AGResponseCallback() - { - @Override - public void onComplete(SubmitScoreResponse result) - { - if (result.isError()) - { - // Add optional error - } else - { - // continue game flow. - Toast.makeText(activity, "Record updated", Toast.LENGTH_SHORT); - } - } - }); - } else + this.agsClient.getLeaderboardsClient().showLeaderboardsOverlay(); + } + else { - Log.d("AmazonGameCircles", "Developer mode you need to sign the app first"); + Log.d(TAG, "Game Service is not ready. This will only work on Signed Apps"); } } @Override - public void showLeaderBoardAmazon(String leaderboard) + public void showLeaderboardAmazon(String leaderboardId) { - Log.d("AmazonGameCircle", "Show LeaderboardID: " + leaderboard); - - if (gameServicesAvaliable == true) + super.showLeaderboardAmazon(leaderboardId); + if(this.agsClient!=null) { - LeaderboardsClient lbClient = agsClient.getLeaderboardsClient(); - if (lbClient != null) - { - lbClient.showLeaderboardOverlay(leaderboard); - } - } else - Log.d("AmazonGameCircles", "if you're debugin it will not work you need to create release"); + this.agsClient.getLeaderboardsClient().showLeaderboardOverlay(leaderboardId); + } + else + { + Log.d(TAG, "Game Service is not ready. This will only work on Signed Apps"); + } } @Override - public void showLeaderboardsAmazon() + public void showAchievementsAmazon() { - Log.d("AmazonGameCircle", "Show Leaderboards"); - if (gameServicesAvaliable) + super.showAchievementsAmazon(); + if(this.agsClient!=null) { - LeaderboardsClient lbClients = agsClient.getLeaderboardsClient(); - if (lbClients != null) - { - lbClients.showLeaderboardsOverlay(); - } - } else - Log.i("Amazon GameCircle:", "If you're on debug this is normal to appear Game Circles doesn't work in debug mode"); - Log.e("Amazon GameCircle:", "Please check if the app is signed or check your manifest settings"); - + this.agsClient.getAchievementsClient().showAchievementsOverlay(); + } + else + { + Log.d(TAG, "Game Service is not ready. This will only work on Signed Apps"); + } } @Override - public void unlockAchievementAmazon(String AchievementID) - { - super.unlockAchievementAmazon(AchievementID); - float unlock = 100.0f; - - this.sendAchievementsUpdate(AchievementID, unlock); - } - - public void showAchievementsAmazon() + public void submitScoreAmazon(String leaderboardID, int score) { - if (gameServicesAvaliable) + super.submitScoreAmazon(leaderboardID, score); + if(this.agsClient!=null) + { + LeaderboardsClient lbClient = agsClient.getLeaderboardsClient(); + AGResponseHandle handle = lbClient.submitScore(leaderboardID, score); + } + else { - AchievementsClient aClient = agsClient.getAchievementsClient(); - if (aClient != null) - { - aClient.showAchievementsOverlay(); - } - } else - Log.i("Amazon GameCircle:", "If you're on debug this is normal to appear Game Circles doesn't work in debug mode"); - Log.e("Amazon GameCircle:", "If you're on debug this is normal to appear"); + Log.d(TAG, "Game Service is not ready. This will only work on Signed Apps"); + } } - private void sendAchievementsUpdate(String achievementID, float achievementProgress) + @Override + public void unlockAchievementAmazon(String AchievementID) { - AchievementsClient aClient = agsClient.getAchievementsClient(); - AGResponseHandle handle = aClient.updateProgress(achievementID, achievementProgress); - // Optional callback to receive notification of success/failure - handle.setCallback(new AGResponseCallback() + super.unlockAchievementAmazon(AchievementID); + float achivementProgress = 100f; + if(this.agsClient!=null) { - @Override - public void onComplete(UpdateProgressResponse result) - { - if (result.isError()) - { - - } else - { - // Continue game flow - } - } - }); + this.agsClient.getAchievementsClient().updateProgress(AchievementID, achivementProgress); + } + else + { + Log.d(TAG, "Game Service is not ready. This will only work on Signed Apps"); + } } - private void shutdownGameCircle() + //TODO Implements this Via C++ java object Calls + public void unlockAchievementAmazon(String AchievementID, float progressUnlock) { - AmazonGamesClient.shutdown(); + if(this.agsClient!=null) + { + this.agsClient.getAchievementsClient().updateProgress(AchievementID, progressUnlock); + } + else + { + Log.d(TAG, "Game Service is not ready. This will only work on Signed Apps"); + } } } diff --git a/External Cocos Helper Android Frameworks/Libs/AmazonAds/amazon-ads-5.7.1.jar b/External Cocos Helper Android Frameworks/Libs/AmazonAds/amazon-ads-5.7.1.jar deleted file mode 100644 index 3e352cd..0000000 Binary files a/External Cocos Helper Android Frameworks/Libs/AmazonAds/amazon-ads-5.7.1.jar and /dev/null differ diff --git a/External Cocos Helper Android Frameworks/Libs/AmazonAds/amazon-ads-5.8.2.jar b/External Cocos Helper Android Frameworks/Libs/AmazonAds/amazon-ads-5.8.2.jar new file mode 100644 index 0000000..4b767cf Binary files /dev/null and b/External Cocos Helper Android Frameworks/Libs/AmazonAds/amazon-ads-5.8.2.jar differ diff --git a/External Cocos Helper Android Frameworks/proj.android-studio/app/AndroidManifest.xml b/External Cocos Helper Android Frameworks/proj.android-studio/app/AndroidManifest.xml index 5467061..8d9a31f 100644 --- a/External Cocos Helper Android Frameworks/proj.android-studio/app/AndroidManifest.xml +++ b/External Cocos Helper Android Frameworks/proj.android-studio/app/AndroidManifest.xml @@ -115,7 +115,7 @@ - +