diff --git a/app/build.gradle.kts b/app/build.gradle.kts index cadd038..30feb36 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -69,8 +69,7 @@ dependencies { implementation("com.google.firebase:firebase-analytics-ktx") implementation("com.google.firebase:firebase-crashlytics-ktx") - //-----------------------------Unity Ads SDK - implementation("com.unity3d.ads:unity-ads:4.9.1") + } \ No newline at end of file diff --git a/app/src/main/java/com/input/board/appskey/keyboard/KeyBoardApp.kt b/app/src/main/java/com/input/board/appskey/keyboard/KeyBoardApp.kt index 75a8742..199d127 100644 --- a/app/src/main/java/com/input/board/appskey/keyboard/KeyBoardApp.kt +++ b/app/src/main/java/com/input/board/appskey/keyboard/KeyBoardApp.kt @@ -1,17 +1,10 @@ package com.input.board.appskey.keyboard import android.app.Application -import android.content.Intent -import android.util.Log -import androidx.localbroadcastmanager.content.LocalBroadcastManager import com.input.board.appskey.keyboard.fileTools.DesFile import com.input.board.appskey.keyboard.fileTools.DesFile.deFile import com.input.board.appskey.keyboard.jsonBean.ChildBean import com.input.board.appskey.keyboard.jsonBean.MainBean -import com.input.board.appskey.keyboard.unityad.UnityAdManager -import com.input.board.appskey.keyboard.unityad.onLoadCallBack -import com.unity3d.ads.IUnityAdsInitializationListener -import com.unity3d.ads.UnityAds import org.json.JSONArray class KeyBoardApp : Application() { @@ -20,13 +13,6 @@ class KeyBoardApp : Application() { lateinit var list: MutableList - const val unityGameID = "5649398" - - const val testMode = false - - var SDKOK = false - const val AD_INIT_ACTION ="ACTION" - } override fun onCreate() { @@ -104,23 +90,7 @@ class KeyBoardApp : Application() { } private fun initUNity() { - Log.d(UnityAdManager.TAG,"----------------------application init") - UnityAds.initialize(this, unityGameID, testMode, object : IUnityAdsInitializationListener { - override fun onInitializationComplete() { - LocalBroadcastManager.getInstance(this@KeyBoardApp).sendBroadcast(Intent(AD_INIT_ACTION)) - SDKOK = true - UnityAdManager.loadAllAdNew() - } - - override fun onInitializationFailed( - error: UnityAds.UnityAdsInitializationError?, - message: String? - ) { - SDKOK = false - } - - }); } } \ No newline at end of file diff --git a/app/src/main/java/com/input/board/appskey/keyboard/unityad/UnityAdManager.java b/app/src/main/java/com/input/board/appskey/keyboard/unityad/UnityAdManager.java deleted file mode 100644 index 29ea3f1..0000000 --- a/app/src/main/java/com/input/board/appskey/keyboard/unityad/UnityAdManager.java +++ /dev/null @@ -1,137 +0,0 @@ -package com.input.board.appskey.keyboard.unityad; - -import android.app.Activity; -import android.content.Context; -import android.content.Intent; -import android.util.Log; - -import androidx.localbroadcastmanager.content.LocalBroadcastManager; - -import com.input.board.appskey.keyboard.KeyBoardApp; -import com.unity3d.ads.IUnityAdsLoadListener; -import com.unity3d.ads.IUnityAdsShowListener; -import com.unity3d.ads.UnityAds; -import com.unity3d.ads.UnityAdsShowOptions; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.Objects; - -public class UnityAdManager { - - - public static String unitAd1 = "Nova_keyboard_ad_unity_inst_open"; - public static String unitAd2 = "Nova_keyboard_ad_unity_inst_set"; - public static String unitAd3 = "Nova_keyboard_ad_unity_inst_theme"; - - - public static String TAG = "--------"; - - - - public static Boolean AD1Ready = false; - public static Boolean AD2Ready = false; - public static Boolean AD3Ready = false; - - - - - - - - - public static void loadAllAdNew() { - if (!AD1Ready) - loadAd(unitAd1); - if (!AD2Ready) - loadAd(unitAd2); - if (!AD3Ready) - loadAd(unitAd3); - } - - public static String getReadyUnitAd() { - ArrayList unitList = new ArrayList<>(); - unitList.add(unitAd1); - unitList.add(unitAd2); - unitList.add(unitAd3); - Collections.shuffle(unitList); - - for (String unit : unitList) { - if (Objects.equals(unit, unitAd1)) { - if (AD1Ready) { - return unit; - } - } else if (Objects.equals(unit, unitAd2)) { - if (AD2Ready) { - return unit; - } - } else if (Objects.equals(unit, unitAd3)) { - if (AD3Ready) { - return unit; - } - } - } - return null; - } - - public static void loadAd(String adUnitId) { - UnityAds.load(adUnitId, new IUnityAdsLoadListener() { - @Override - public void onUnityAdsAdLoaded(String placementId) { - Log.d(TAG, "------loaded-unit" + placementId); - if (Objects.equals(placementId, unitAd1)) { - AD1Ready = true; - } else if (Objects.equals(placementId, unitAd2)) { - AD2Ready = true; - } else if (Objects.equals(placementId, unitAd3)) { - AD3Ready = true; - } - - } - - @Override - public void onUnityAdsFailedToLoad(String placementId, UnityAds.UnityAdsLoadError error, String message) { - Log.d(TAG, "------load fail-unit" + placementId + "-----" + message); - } - }); - - } - - - - public static void showUnityAd(Activity activity, String adUnitId, onShowCallBack onShowCallBack) { - UnityAds.show(activity, adUnitId, new UnityAdsShowOptions(), new IUnityAdsShowListener() { - @Override - public void onUnityAdsShowFailure(String placementId, UnityAds.UnityAdsShowError error, String message) { - onShowCallBack.onShowFail(); - Log.d(TAG, "--------onUnityAdsShowFailure---message=" + message); - } - - @Override - public void onUnityAdsShowStart(String placementId) { - Log.d(TAG, "--------onUnityAdsShowStart---=" + placementId); - if (Objects.equals(placementId, unitAd1)) { - AD1Ready = false; - } else if (Objects.equals(placementId, unitAd2)) { - AD2Ready = false; - } else if (Objects.equals(placementId, unitAd3)) { - AD3Ready = false; - } - onShowCallBack.onShowSuccess(); - - } - - @Override - public void onUnityAdsShowClick(String placementId) { - - } - - @Override - public void onUnityAdsShowComplete(String placementId, UnityAds.UnityAdsShowCompletionState state) { - onShowCallBack.onShowClose(); - Log.d(TAG, "--------onUnityAdsShowComplete---"); - loadAd(placementId); - } - }); - } -} diff --git a/app/src/main/java/com/input/board/appskey/keyboard/unityad/onLoadCallBack.java b/app/src/main/java/com/input/board/appskey/keyboard/unityad/onLoadCallBack.java deleted file mode 100644 index 2cf6426..0000000 --- a/app/src/main/java/com/input/board/appskey/keyboard/unityad/onLoadCallBack.java +++ /dev/null @@ -1,6 +0,0 @@ -package com.input.board.appskey.keyboard.unityad; - -public interface onLoadCallBack { - - void onIsLoad(boolean loaded); -} diff --git a/app/src/main/java/com/input/board/appskey/keyboard/unityad/onShowCallBack.java b/app/src/main/java/com/input/board/appskey/keyboard/unityad/onShowCallBack.java deleted file mode 100644 index 1b527e9..0000000 --- a/app/src/main/java/com/input/board/appskey/keyboard/unityad/onShowCallBack.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.input.board.appskey.keyboard.unityad; - -public interface onShowCallBack { - - void onShowFail( ); - void onShowClose( ); - void onShowSuccess( ); -} diff --git a/app/src/main/java/com/input/board/appskey/keyboard/viewUi/ApplyActivity.kt b/app/src/main/java/com/input/board/appskey/keyboard/viewUi/ApplyActivity.kt index 4b8529e..beaae3a 100644 --- a/app/src/main/java/com/input/board/appskey/keyboard/viewUi/ApplyActivity.kt +++ b/app/src/main/java/com/input/board/appskey/keyboard/viewUi/ApplyActivity.kt @@ -11,7 +11,12 @@ import android.widget.Toast import androidx.appcompat.app.AppCompatActivity import androidx.recyclerview.widget.GridLayoutManager import androidx.recyclerview.widget.RecyclerView - +import com.bumptech.glide.Glide +import com.bumptech.glide.integration.webp.decoder.WebpDrawable +import com.bumptech.glide.load.DataSource +import com.bumptech.glide.load.engine.GlideException +import com.bumptech.glide.request.RequestListener +import com.bumptech.glide.request.target.Target import com.input.board.appskey.keyboard.KeyBoardApp import com.input.board.appskey.keyboard.R import com.input.board.appskey.keyboard.fileTools.DownloadZip @@ -20,15 +25,6 @@ import com.input.board.appskey.keyboard.fileTools.SpSkin import com.input.board.appskey.keyboard.interf.onApplyCallback import com.input.board.appskey.keyboard.interf.onClickCallback import com.input.board.appskey.keyboard.recyAdapter.ForYouAdapter -import com.bumptech.glide.Glide -import com.bumptech.glide.integration.webp.decoder.WebpDrawable -import com.bumptech.glide.load.DataSource -import com.bumptech.glide.load.engine.GlideException -import com.bumptech.glide.request.RequestListener -import com.bumptech.glide.request.target.Target -import com.input.board.appskey.keyboard.interf.onAdShowCallback -import com.input.board.appskey.keyboard.unityad.UnityAdManager -import com.input.board.appskey.keyboard.unityad.onShowCallBack import java.io.File class ApplyActivity : AppCompatActivity() { @@ -227,24 +223,6 @@ class ApplyActivity : AppCompatActivity() { } private fun showInterAd(action:()->Unit) { - val readyUnitAd = UnityAdManager.getReadyUnitAd() - if (readyUnitAd == null) { - action.invoke() - } else { - UnityAdManager.showUnityAd(this, readyUnitAd, object : onShowCallBack { - override fun onShowFail() { - action.invoke() - } - - override fun onShowClose() { - action.invoke() - } - - override fun onShowSuccess() { - - } - - }) - } + action.invoke() } } \ No newline at end of file diff --git a/app/src/main/java/com/input/board/appskey/keyboard/viewUi/NovaActivity.kt b/app/src/main/java/com/input/board/appskey/keyboard/viewUi/NovaActivity.kt index dbddc47..9956781 100644 --- a/app/src/main/java/com/input/board/appskey/keyboard/viewUi/NovaActivity.kt +++ b/app/src/main/java/com/input/board/appskey/keyboard/viewUi/NovaActivity.kt @@ -1,21 +1,12 @@ package com.input.board.appskey.keyboard.viewUi -import android.content.BroadcastReceiver -import android.content.Context import android.content.Intent -import android.content.IntentFilter import android.os.Bundle import android.os.CountDownTimer -import android.util.Log import android.widget.ImageView import android.widget.ProgressBar import androidx.appcompat.app.AppCompatActivity -import androidx.localbroadcastmanager.content.LocalBroadcastManager -import com.input.board.appskey.keyboard.KeyBoardApp import com.input.board.appskey.keyboard.R -import com.input.board.appskey.keyboard.unityad.UnityAdManager -import com.input.board.appskey.keyboard.unityad.onShowCallBack -import java.util.Timer class NovaActivity : AppCompatActivity() { @@ -28,9 +19,6 @@ class NovaActivity : AppCompatActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - UnityAdManager.loadAd(UnityAdManager.unitAd1) - UnityAdManager.loadAd(UnityAdManager.unitAd2) - UnityAdManager.loadAd(UnityAdManager.unitAd3) setContentView(R.layout.activity_nova) init() findView() @@ -40,40 +28,14 @@ class NovaActivity : AppCompatActivity() { timer = object : CountDownTimer(countTime, 100) { override fun onTick(millisUntilFinished: Long) { - Log.d( - UnityAdManager.TAG, - "--------millisUntilFinished=${millisUntilFinished} $needShow" - ) - if (needShow) { - startShowAd({ - toHome() - }, false) - } + } override fun onFinish() { - Log.d(UnityAdManager.TAG, "--------onFinish needShow=${needShow}") - if (needShow) { - startShowAd({ - toHome() - }, true) - } + toHome() } } - if (KeyBoardApp.SDKOK) { - Log.d(UnityAdManager.TAG, "--------initSDK true") - timer.start() - } else { - LocalBroadcastManager.getInstance(this).registerReceiver(object : BroadcastReceiver() { - override fun onReceive(context: Context?, intent: Intent?) { - Log.d(UnityAdManager.TAG, "--------onReceive") - timer.start() - } - - }, IntentFilter(KeyBoardApp.AD_INIT_ACTION)) - } - } @@ -84,34 +46,6 @@ class NovaActivity : AppCompatActivity() { } - private fun startShowAd(action: () -> Unit, isFinish: Boolean) { - val readyUnitAd = UnityAdManager.getReadyUnitAd() - if (readyUnitAd != null) { - needShow = false - UnityAdManager.showUnityAd(this@NovaActivity, readyUnitAd, object : - onShowCallBack { - override fun onShowFail() { - action.invoke() - } - - override fun onShowClose() { - action.invoke() - } - - override fun onShowSuccess() { - - } - - }) - } else { - if (isFinish) { - action.invoke() - } - - } - } - - private fun toHome() { startActivity(Intent(this, HomeActivity::class.java)) finish()