From 1e1ec0302145c91a45f2b49a766e0960d4184418 Mon Sep 17 00:00:00 2001 From: t00564191 Date: Tue, 25 Oct 2022 20:34:20 +0900 Subject: [PATCH] Fix build APK --- .../External/com/huawei/adplugin/Const.java | 2 + .../com/huawei/adplugin/HuaweiAdsPlugin.java | 11 ++--- .../adlistener/IRewardAdLoadListener.java | 1 - .../adlistener/IRewardAdStatusListener.java | 1 - .../adplugin/adproxy/BannerAdProxy.java | 41 +++++++++---------- Source/HuaweiAds/HuaweiAds_APL.xml | 1 + 6 files changed, 29 insertions(+), 28 deletions(-) diff --git a/Source/HuaweiAds/External/com/huawei/adplugin/Const.java b/Source/HuaweiAds/External/com/huawei/adplugin/Const.java index 48fd1cd..d0de8a9 100644 --- a/Source/HuaweiAds/External/com/huawei/adplugin/Const.java +++ b/Source/HuaweiAds/External/com/huawei/adplugin/Const.java @@ -1,5 +1,7 @@ package com.huawei.adplugin; +import android.view.Gravity; + public class Const { public static final class BannerAdSize { public static final String USER_DEFINED = "USER_DEFINED"; diff --git a/Source/HuaweiAds/External/com/huawei/adplugin/HuaweiAdsPlugin.java b/Source/HuaweiAds/External/com/huawei/adplugin/HuaweiAdsPlugin.java index 4204a44..0366af2 100644 --- a/Source/HuaweiAds/External/com/huawei/adplugin/HuaweiAdsPlugin.java +++ b/Source/HuaweiAds/External/com/huawei/adplugin/HuaweiAdsPlugin.java @@ -1,6 +1,7 @@ package com.huawei.adplugin; -import com.huawei.adplugin.*; +import com.huawei.adplugin.adproxy.*; +import com.huawei.adplugin.adlistener.*; import com.huawei.hms.ads.*; import android.app.Activity; @@ -19,7 +20,7 @@ public static void initialize(Activity activity) { } } - public static void loadBannerAd(String adId, int position, String size, IAdStatusListener adStatusListener) { + public static void loadBannerAd(String adId, int position, String size, final IAdStatusListener adStatusListener) { if (mActivity == null) { return; } @@ -101,7 +102,7 @@ public static void destroyBannerAd() { } } - public static void loadInterstitialAd(String adId, IAdStatusListener adStatusListener) { + public static void loadInterstitialAd(String adId, final IAdStatusListener adStatusListener) { if (mActivity == null) { return; } @@ -170,12 +171,12 @@ public static void showInterstitialAd() { } } - public static void loadRewardAd(String adId, IRewardAdLoadListener rewardLoadListener, IRewardAdStatusListener rewardStatusListener) { + public static void loadRewardAd(String adId, final IRewardAdLoadListener rewardLoadListener, final IRewardAdStatusListener rewardStatusListener) { if (mActivity == null) { return; } if (rewardAdProxy == null) { - rewardAdProxy = new RewardAdProxy(adId, mActivity); + rewardAdProxy = new RewardAdProxy(mActivity, adId); } AdParam adParam = new AdParam.Builder().build(); rewardAdProxy.loadAd(adParam, new IRewardAdLoadListener() { diff --git a/Source/HuaweiAds/External/com/huawei/adplugin/adlistener/IRewardAdLoadListener.java b/Source/HuaweiAds/External/com/huawei/adplugin/adlistener/IRewardAdLoadListener.java index a8815be..1b9ded3 100644 --- a/Source/HuaweiAds/External/com/huawei/adplugin/adlistener/IRewardAdLoadListener.java +++ b/Source/HuaweiAds/External/com/huawei/adplugin/adlistener/IRewardAdLoadListener.java @@ -1,4 +1,3 @@ - package com.huawei.adplugin.adlistener; public interface IRewardAdLoadListener { diff --git a/Source/HuaweiAds/External/com/huawei/adplugin/adlistener/IRewardAdStatusListener.java b/Source/HuaweiAds/External/com/huawei/adplugin/adlistener/IRewardAdStatusListener.java index a933a80..d9cb13f 100644 --- a/Source/HuaweiAds/External/com/huawei/adplugin/adlistener/IRewardAdStatusListener.java +++ b/Source/HuaweiAds/External/com/huawei/adplugin/adlistener/IRewardAdStatusListener.java @@ -1,4 +1,3 @@ - package com.huawei.adplugin.adlistener; public interface IRewardAdStatusListener { diff --git a/Source/HuaweiAds/External/com/huawei/adplugin/adproxy/BannerAdProxy.java b/Source/HuaweiAds/External/com/huawei/adplugin/adproxy/BannerAdProxy.java index e8fcbb9..8805073 100644 --- a/Source/HuaweiAds/External/com/huawei/adplugin/adproxy/BannerAdProxy.java +++ b/Source/HuaweiAds/External/com/huawei/adplugin/adproxy/BannerAdProxy.java @@ -16,8 +16,7 @@ import com.huawei.hms.ads.AdParam; import com.huawei.hms.ads.BannerAdSize; import com.huawei.hms.ads.banner.BannerView; -import com.huawei.adplugin.Const.BannerAdPositionCode; -import com.huawei.adplugin.Const.BannerAdSize; +import com.huawei.adplugin.Const; import com.huawei.adplugin.adlistener.IAdStatusListener; public class BannerAdProxy extends AdListener { @@ -33,9 +32,9 @@ public class BannerAdProxy extends AdListener { private String mAdId; - private String mAdSizeType = BannerAdSize.USER_DEFINED; + private String mAdSizeType = Const.BannerAdSize.USER_DEFINED; - private int mPositionCode = BannerAdPositionCode.POSITION_TOP; + private int mPositionCode = Const.BannerAdPositionCode.POSITION_TOP; private int mHorizontalOffset = 0; @@ -131,7 +130,7 @@ public void run() { } public void setBannerAdPosition(final int positionX, final int positionY) { - mPositionCode = BannerAdPositionCode.POSITION_CUSTOM; + mPositionCode = Const.BannerAdPositionCode.POSITION_CUSTOM; mHorizontalOffset = positionX; mVerticalOffset = positionY; updatePosition(); @@ -246,37 +245,37 @@ private float convertDpToPx(float dp) { private BannerAdSize getTargetBannerAdSize(String adSize) { BannerAdSize bannerAdSize = BannerAdSize.BANNER_SIZE_INVALID; switch (adSize) { - case BannerAdSize.USER_DEFINED: + case Const.BannerAdSize.USER_DEFINED: bannerAdSize = getUserDefinedBannerSize(); break; - case BannerAdSize.BANNER_SIZE_320_50: + case Const.BannerAdSize.BANNER_SIZE_320_50: bannerAdSize = BannerAdSize.BANNER_SIZE_320_50; break; - case BannerAdSize.BANNER_SIZE_320_100: + case Const.BannerAdSize.BANNER_SIZE_320_100: bannerAdSize = BannerAdSize.BANNER_SIZE_320_100; break; - case BannerAdSize.BANNER_SIZE_468_60: + case Const.BannerAdSize.BANNER_SIZE_468_60: bannerAdSize = BannerAdSize.BANNER_SIZE_468_60; break; - case BannerAdSize.BANNER_SIZE_DYNAMIC: + case Const.BannerAdSize.BANNER_SIZE_DYNAMIC: bannerAdSize = BannerAdSize.BANNER_SIZE_DYNAMIC; break; - case BannerAdSize.BANNER_SIZE_728_90: + case Const.BannerAdSize.BANNER_SIZE_728_90: bannerAdSize = BannerAdSize.BANNER_SIZE_728_90; break; - case BannerAdSize.BANNER_SIZE_300_250: + case Const.BannerAdSize.BANNER_SIZE_300_250: bannerAdSize = BannerAdSize.BANNER_SIZE_300_250; break; - case BannerAdSize.BANNER_SIZE_SMART: + case Const.BannerAdSize.BANNER_SIZE_SMART: bannerAdSize = BannerAdSize.BANNER_SIZE_SMART; break; - case BannerAdSize.BANNER_SIZE_160_600: + case Const.BannerAdSize.BANNER_SIZE_160_600: bannerAdSize = BannerAdSize.BANNER_SIZE_160_600; break; - case BannerAdSize.BANNER_SIZE_360_57: + case Const.BannerAdSize.BANNER_SIZE_360_57: bannerAdSize = BannerAdSize.BANNER_SIZE_360_57; break; - case BannerAdSize.BANNER_SIZE_360_144: + case Const.BannerAdSize.BANNER_SIZE_360_144: bannerAdSize = BannerAdSize.BANNER_SIZE_360_144; break; default: @@ -292,10 +291,10 @@ private BannerAdSize getUserDefinedBannerSize() { private FrameLayout.LayoutParams getBannerViewLayoutParams() { final FrameLayout.LayoutParams adParams = new FrameLayout.LayoutParams(FrameLayout.LayoutParams.WRAP_CONTENT, FrameLayout.LayoutParams.WRAP_CONTENT); - adParams.gravity = BannerAdPositionCode.getLayoutGravityForPositionCode(mPositionCode); + adParams.gravity = Const.BannerAdPositionCode.getLayoutGravityForPositionCode(mPositionCode); int safeInsetLeft = 0; int safeInsetTop = 0; - if (mPositionCode == BannerAdPositionCode.POSITION_CUSTOM) { + if (mPositionCode == Const.BannerAdPositionCode.POSITION_CUSTOM) { int leftOffset = (int) convertDpToPx(mHorizontalOffset); if (leftOffset < safeInsetLeft) { leftOffset = safeInsetLeft; @@ -308,9 +307,9 @@ private FrameLayout.LayoutParams getBannerViewLayoutParams() { adParams.topMargin = topOffset; } else { adParams.leftMargin = safeInsetLeft; - if (mPositionCode == BannerAdPositionCode.POSITION_TOP - || mPositionCode == BannerAdPositionCode.POSITION_TOP_LEFT - || mPositionCode == BannerAdPositionCode.POSITION_TOP_RIGHT) { + if (mPositionCode == Const.BannerAdPositionCode.POSITION_TOP + || mPositionCode == Const.BannerAdPositionCode.POSITION_TOP_LEFT + || mPositionCode == Const.BannerAdPositionCode.POSITION_TOP_RIGHT) { adParams.topMargin = safeInsetTop; } } diff --git a/Source/HuaweiAds/HuaweiAds_APL.xml b/Source/HuaweiAds/HuaweiAds_APL.xml index e032a6c..8d778c2 100644 --- a/Source/HuaweiAds/HuaweiAds_APL.xml +++ b/Source/HuaweiAds/HuaweiAds_APL.xml @@ -78,6 +78,7 @@