diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 153740a..1c22adb 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -65,8 +65,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") + diff --git a/app/src/main/java/com/sunny/app/soft/timberkeyboardnew/App.kt b/app/src/main/java/com/sunny/app/soft/timberkeyboardnew/App.kt index e66c086..76f438c 100644 --- a/app/src/main/java/com/sunny/app/soft/timberkeyboardnew/App.kt +++ b/app/src/main/java/com/sunny/app/soft/timberkeyboardnew/App.kt @@ -2,10 +2,6 @@ package com.sunny.app.soft.timberkeyboardnew import android.app.Application import android.content.Context -import android.util.Log -import com.sunny.app.soft.timberkeyboardnew.unityad.UnityAdManager -import com.unity3d.ads.IUnityAdsInitializationListener -import com.unity3d.ads.UnityAds class App : Application() { @@ -33,21 +29,6 @@ class App : Application() { private fun initUNity() { - Log.d(UnityAdManager.TAG, "----------------------application init") - UnityAds.initialize(this, UnityAdManager.unityGameID, UnityAdManager.testMode, object : IUnityAdsInitializationListener { - override fun onInitializationComplete() { - 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/sunny/app/soft/timberkeyboardnew/ui/activity/DownloadActivity.kt b/app/src/main/java/com/sunny/app/soft/timberkeyboardnew/ui/activity/DownloadActivity.kt index e175585..9569e87 100644 --- a/app/src/main/java/com/sunny/app/soft/timberkeyboardnew/ui/activity/DownloadActivity.kt +++ b/app/src/main/java/com/sunny/app/soft/timberkeyboardnew/ui/activity/DownloadActivity.kt @@ -8,7 +8,6 @@ import android.graphics.drawable.BitmapDrawable import android.util.Log import android.view.View import android.widget.Toast - import com.bumptech.glide.Glide import com.bumptech.glide.load.DataSource import com.bumptech.glide.load.engine.GlideException @@ -21,8 +20,6 @@ import com.sunny.app.soft.timberkeyboardnew.tools.AppConstant import com.sunny.app.soft.timberkeyboardnew.tools.KeyboardManager import com.sunny.app.soft.timberkeyboardnew.tools.ZipTools import com.sunny.app.soft.timberkeyboardnew.ui.listener.ApplyListener -import com.sunny.app.soft.timberkeyboardnew.unityad.UnityAdManager -import com.sunny.app.soft.timberkeyboardnew.unityad.onShowCallBack import java.io.ByteArrayOutputStream import java.io.File import java.io.FileInputStream @@ -92,25 +89,25 @@ class DownloadActivity : } private fun onShowAd() { - val readyUnitAd = UnityAdManager.getReadyUnitAd() - if (readyUnitAd == null) { - startSetSkin() - } else { - UnityAdManager.showUnityAd(this, readyUnitAd, object : onShowCallBack { - override fun onShowFail() { - startSetSkin() - } - - override fun onShowClose() { - startSetSkin() - } - - override fun onShowSuccess() { - - } - - }) - } +// val readyUnitAd = UnityAdManager.getReadyUnitAd() +// if (readyUnitAd == null) { +// startSetSkin() +// } else { +// UnityAdManager.showUnityAd(this, readyUnitAd, object : onShowCallBack { +// override fun onShowFail() { +// startSetSkin() +// } +// +// override fun onShowClose() { +// startSetSkin() +// } +// +// override fun onShowSuccess() { +// +// } +// +// }) +// } } diff --git a/app/src/main/java/com/sunny/app/soft/timberkeyboardnew/ui/activity/LoadingActivity.kt b/app/src/main/java/com/sunny/app/soft/timberkeyboardnew/ui/activity/LoadingActivity.kt index e22e33c..34269ec 100644 --- a/app/src/main/java/com/sunny/app/soft/timberkeyboardnew/ui/activity/LoadingActivity.kt +++ b/app/src/main/java/com/sunny/app/soft/timberkeyboardnew/ui/activity/LoadingActivity.kt @@ -2,11 +2,8 @@ package com.sunny.app.soft.timberkeyboardnew.ui.activity import android.content.Intent import android.os.CountDownTimer -import android.util.Log import android.view.View import com.sunny.app.soft.timberkeyboardnew.databinding.ActivityLoadingBinding -import com.sunny.app.soft.timberkeyboardnew.unityad.UnityAdManager -import com.sunny.app.soft.timberkeyboardnew.unityad.onShowCallBack class LoadingActivity : BaseActivity() { @@ -32,10 +29,9 @@ class LoadingActivity : BaseActivity() { timer = object : CountDownTimer(11000, 100) { override fun onTick(millisUntilFinished: Long) { - Log.d(UnityAdManager.TAG, "----------------------onTick =$millisUntilFinished") + if (hasShow) return show(false) { - intoMainActivity() } @@ -44,7 +40,7 @@ class LoadingActivity : BaseActivity() { } override fun onFinish() { - Log.d(UnityAdManager.TAG, "----------------------onFinish =$hasShow") + if (!hasShow) { show(true) { intoMainActivity() @@ -60,31 +56,31 @@ class LoadingActivity : BaseActivity() { private fun show(isFinish: Boolean, action: (showSuccess: Boolean) -> Unit) { - val readyUnitAd = UnityAdManager.getReadyUnitAd() - if (readyUnitAd != null) { - hasShow = true - UnityAdManager.showUnityAd(this@LoadingActivity, readyUnitAd, object : - onShowCallBack { - override fun onShowFail() { - action.invoke(false) - } - - override fun onShowClose() { - intoMainActivity() - action.invoke(true) - } - - override fun onShowSuccess() { - - } - - }) - } else { - if (isFinish) { - action.invoke(false) - } - - } +// val readyUnitAd = UnityAdManager.getReadyUnitAd() +// if (readyUnitAd != null) { +// hasShow = true +// UnityAdManager.showUnityAd(this@LoadingActivity, readyUnitAd, object : +// onShowCallBack { +// override fun onShowFail() { +// action.invoke(false) +// } +// +// override fun onShowClose() { +// intoMainActivity() +// action.invoke(true) +// } +// +// override fun onShowSuccess() { +// +// } +// +// }) +// } else { +// if (isFinish) { +// action.invoke(false) +// } +// +// } } private fun intoMainActivity() { diff --git a/app/src/main/java/com/sunny/app/soft/timberkeyboardnew/ui/fragment/HomeFragment.kt b/app/src/main/java/com/sunny/app/soft/timberkeyboardnew/ui/fragment/HomeFragment.kt index 900d39a..7b20603 100644 --- a/app/src/main/java/com/sunny/app/soft/timberkeyboardnew/ui/fragment/HomeFragment.kt +++ b/app/src/main/java/com/sunny/app/soft/timberkeyboardnew/ui/fragment/HomeFragment.kt @@ -3,7 +3,6 @@ package com.sunny.app.soft.timberkeyboardnew.ui.fragment import android.content.Intent import android.view.View import androidx.recyclerview.widget.LinearLayoutManager - import com.sunny.app.soft.timberkeyboardnew.App import com.sunny.app.soft.timberkeyboardnew.R import com.sunny.app.soft.timberkeyboardnew.data.DataManager @@ -13,8 +12,6 @@ import com.sunny.app.soft.timberkeyboardnew.tools.AppConstant import com.sunny.app.soft.timberkeyboardnew.ui.activity.SelectActivity import com.sunny.app.soft.timberkeyboardnew.ui.adapter.HomeViewAdapter import com.sunny.app.soft.timberkeyboardnew.ui.listener.OnItemClickListener -import com.sunny.app.soft.timberkeyboardnew.unityad.UnityAdManager -import com.sunny.app.soft.timberkeyboardnew.unityad.onShowCallBack class HomeFragment : BaseFragment() { @@ -64,25 +61,25 @@ class HomeFragment : fun onShowAd() { - val readyUnitAd = UnityAdManager.getReadyUnitAd() - if (readyUnitAd == null) { - enterList() - } else { - UnityAdManager.showUnityAd(requireActivity(), readyUnitAd, object : onShowCallBack { - override fun onShowFail() { - enterList() - } - - override fun onShowClose() { - enterList() - } - - override fun onShowSuccess() { - - } - - }) - } +// val readyUnitAd = UnityAdManager.getReadyUnitAd() +// if (readyUnitAd == null) { +// enterList() +// } else { +// UnityAdManager.showUnityAd(requireActivity(), readyUnitAd, object : onShowCallBack { +// override fun onShowFail() { +// enterList() +// } +// +// override fun onShowClose() { +// enterList() +// } +// +// override fun onShowSuccess() { +// +// } +// +// }) +// } } diff --git a/app/src/main/java/com/sunny/app/soft/timberkeyboardnew/unityad/UnityAdManager.java b/app/src/main/java/com/sunny/app/soft/timberkeyboardnew/unityad/UnityAdManager.java deleted file mode 100644 index 1e45441..0000000 --- a/app/src/main/java/com/sunny/app/soft/timberkeyboardnew/unityad/UnityAdManager.java +++ /dev/null @@ -1,139 +0,0 @@ -package com.sunny.app.soft.timberkeyboardnew.unityad; - -import android.app.Activity; -import android.content.Intent; -import android.util.Log; - -import androidx.localbroadcastmanager.content.LocalBroadcastManager; - -import com.sunny.app.soft.timberkeyboardnew.App; -import com.unity3d.ads.IUnityAdsInitializationListener; -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 unityGameID = "5649487"; - - public static Boolean testMode = false; - - public static String unitAd1 = "Custom_Keyboard_ad_unity_inst_open"; - public static String unitAd2 = "Custom_Keyboard_ad_unity_inst_set"; - public static String unitAd3 = "Custom_Keyboard_ad_unity_inst_theme"; - - public static Boolean AD1Ready = false; - public static Boolean AD2Ready = false; - public static Boolean AD3Ready = false; - - - - - public static String TAG = "-----------------tt"; - - - - - - - - - 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/sunny/app/soft/timberkeyboardnew/unityad/onShowCallBack.java b/app/src/main/java/com/sunny/app/soft/timberkeyboardnew/unityad/onShowCallBack.java deleted file mode 100644 index b6bb030..0000000 --- a/app/src/main/java/com/sunny/app/soft/timberkeyboardnew/unityad/onShowCallBack.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.sunny.app.soft.timberkeyboardnew.unityad; - -public interface onShowCallBack { - - void onShowFail( ); - void onShowClose( ); - void onShowSuccess( ); -}