删除unity集成
This commit is contained in:
parent
ba0ac9fcaf
commit
00e10020c0
@ -82,6 +82,5 @@ dependencies {
|
|||||||
implementation("com.google.firebase:firebase-analytics-ktx")
|
implementation("com.google.firebase:firebase-analytics-ktx")
|
||||||
implementation ("com.google.firebase:firebase-crashlytics-ktx")
|
implementation ("com.google.firebase:firebase-crashlytics-ktx")
|
||||||
|
|
||||||
//-----------------------------Unity Ads SDK
|
|
||||||
implementation("com.unity3d.ads:unity-ads:4.9.1")
|
|
||||||
}
|
}
|
||||||
@ -1,15 +1,10 @@
|
|||||||
package com.cute.girl.hd.pink.img.wallpaper
|
package com.cute.girl.hd.pink.img.wallpaper
|
||||||
|
|
||||||
import android.app.Application
|
import android.app.Application
|
||||||
import android.content.Intent
|
|
||||||
import android.util.Log
|
import android.util.Log
|
||||||
import androidx.localbroadcastmanager.content.LocalBroadcastManager
|
|
||||||
import com.cute.girl.hd.pink.img.wallpaper.entity.CategoryData
|
import com.cute.girl.hd.pink.img.wallpaper.entity.CategoryData
|
||||||
import com.cute.girl.hd.pink.img.wallpaper.entity.Data
|
import com.cute.girl.hd.pink.img.wallpaper.entity.Data
|
||||||
import com.cute.girl.hd.pink.img.wallpaper.unityad.UnityAdManager
|
|
||||||
import com.liulishuo.filedownloader.FileDownloader
|
import com.liulishuo.filedownloader.FileDownloader
|
||||||
import com.unity3d.ads.IUnityAdsInitializationListener
|
|
||||||
import com.unity3d.ads.UnityAds
|
|
||||||
import org.json.JSONArray
|
import org.json.JSONArray
|
||||||
import java.io.BufferedReader
|
import java.io.BufferedReader
|
||||||
import java.io.ByteArrayOutputStream
|
import java.io.ByteArrayOutputStream
|
||||||
@ -111,24 +106,23 @@ class MyApp : Application() {
|
|||||||
|
|
||||||
|
|
||||||
private fun initSDK() {
|
private fun initSDK() {
|
||||||
Log.d(UnityAdManager.TAG, "----------------------application init")
|
// UnityAds.initialize(this, UnityAdManager.unityGameID, UnityAdManager.testMode, object :
|
||||||
UnityAds.initialize(this, UnityAdManager.unityGameID, UnityAdManager.testMode, object :
|
// IUnityAdsInitializationListener {
|
||||||
IUnityAdsInitializationListener {
|
// override fun onInitializationComplete() {
|
||||||
override fun onInitializationComplete() {
|
// LocalBroadcastManager.getInstance(this@MyApp).sendBroadcast(Intent(AD_INIT_ACTION))
|
||||||
LocalBroadcastManager.getInstance(this@MyApp).sendBroadcast(Intent(AD_INIT_ACTION))
|
// initSDK = true
|
||||||
initSDK = true
|
// UnityAdManager.loadAllAdNew()
|
||||||
UnityAdManager.loadAllAdNew()
|
//
|
||||||
|
// }
|
||||||
}
|
//
|
||||||
|
// override fun onInitializationFailed(
|
||||||
override fun onInitializationFailed(
|
// error: UnityAds.UnityAdsInitializationError?,
|
||||||
error: UnityAds.UnityAdsInitializationError?,
|
// message: String?
|
||||||
message: String?
|
// ) {
|
||||||
) {
|
// initSDK = false
|
||||||
initSDK = false
|
// }
|
||||||
}
|
//
|
||||||
|
// });
|
||||||
});
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
@ -12,14 +12,11 @@ import android.widget.Toast
|
|||||||
import androidx.appcompat.app.AppCompatActivity
|
import androidx.appcompat.app.AppCompatActivity
|
||||||
import androidx.lifecycle.lifecycleScope
|
import androidx.lifecycle.lifecycleScope
|
||||||
import androidx.viewpager2.widget.ViewPager2
|
import androidx.viewpager2.widget.ViewPager2
|
||||||
import com.bumptech.glide.Glide
|
|
||||||
import com.cute.girl.hd.pink.img.wallpaper.R
|
import com.cute.girl.hd.pink.img.wallpaper.R
|
||||||
import com.cute.girl.hd.pink.img.wallpaper.adapter.ImagePagerAdapter
|
import com.cute.girl.hd.pink.img.wallpaper.adapter.ImagePagerAdapter
|
||||||
import com.cute.girl.hd.pink.img.wallpaper.databinding.AbilityPreviewBinding
|
import com.cute.girl.hd.pink.img.wallpaper.databinding.AbilityPreviewBinding
|
||||||
import com.cute.girl.hd.pink.img.wallpaper.entity.Data
|
import com.cute.girl.hd.pink.img.wallpaper.entity.Data
|
||||||
import com.cute.girl.hd.pink.img.wallpaper.entity.IntentConstants
|
import com.cute.girl.hd.pink.img.wallpaper.entity.IntentConstants
|
||||||
import com.cute.girl.hd.pink.img.wallpaper.unityad.UnityAdManager
|
|
||||||
import com.cute.girl.hd.pink.img.wallpaper.unityad.onShowCallBack
|
|
||||||
import com.cute.girl.hd.pink.img.wallpaper.utils.DownloadUtil
|
import com.cute.girl.hd.pink.img.wallpaper.utils.DownloadUtil
|
||||||
import com.cute.girl.hd.pink.img.wallpaper.utils.GlobalExt.getString
|
import com.cute.girl.hd.pink.img.wallpaper.utils.GlobalExt.getString
|
||||||
import com.cute.girl.hd.pink.img.wallpaper.utils.GlobalExt.hide
|
import com.cute.girl.hd.pink.img.wallpaper.utils.GlobalExt.hide
|
||||||
@ -28,9 +25,6 @@ import com.cute.girl.hd.pink.img.wallpaper.utils.GlobalExt.show
|
|||||||
import com.cute.girl.hd.pink.img.wallpaper.utils.MediaUtil
|
import com.cute.girl.hd.pink.img.wallpaper.utils.MediaUtil
|
||||||
import com.cute.girl.hd.pink.img.wallpaper.utils.PermissionUtil
|
import com.cute.girl.hd.pink.img.wallpaper.utils.PermissionUtil
|
||||||
import com.cute.girl.hd.pink.img.wallpaper.view.SetAsDialog
|
import com.cute.girl.hd.pink.img.wallpaper.view.SetAsDialog
|
||||||
import com.liulishuo.filedownloader.BaseDownloadTask
|
|
||||||
import com.liulishuo.filedownloader.FileDownloadListener
|
|
||||||
import com.liulishuo.filedownloader.FileDownloader
|
|
||||||
import kotlinx.coroutines.launch
|
import kotlinx.coroutines.launch
|
||||||
import pub.devrel.easypermissions.EasyPermissions
|
import pub.devrel.easypermissions.EasyPermissions
|
||||||
import java.io.File
|
import java.io.File
|
||||||
@ -62,26 +56,8 @@ class PreviewAbility : AppCompatActivity(), EasyPermissions.PermissionCallbacks
|
|||||||
}
|
}
|
||||||
|
|
||||||
private fun showMyMAx(action: () -> Unit) {
|
private fun showMyMAx(action: () -> Unit) {
|
||||||
val readyUnitAd = UnityAdManager.getReadyUnitAd()
|
// TODO:
|
||||||
if (readyUnitAd == null) {
|
action.invoke()
|
||||||
action.invoke()
|
|
||||||
} else {
|
|
||||||
UnityAdManager.showUnityAd(this, readyUnitAd, object : onShowCallBack {
|
|
||||||
override fun onShowFail() {
|
|
||||||
action.invoke()
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun onShowClose() {
|
|
||||||
action.invoke()
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun onShowSuccess() {
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun setupViews() {
|
private fun setupViews() {
|
||||||
|
|||||||
@ -1,18 +1,10 @@
|
|||||||
package com.cute.girl.hd.pink.img.wallpaper.page
|
package com.cute.girl.hd.pink.img.wallpaper.page
|
||||||
|
|
||||||
import android.content.BroadcastReceiver
|
|
||||||
import android.content.Context
|
|
||||||
import android.content.Intent
|
import android.content.Intent
|
||||||
import android.content.IntentFilter
|
|
||||||
import android.os.Bundle
|
import android.os.Bundle
|
||||||
import android.os.CountDownTimer
|
import android.os.CountDownTimer
|
||||||
import android.util.Log
|
|
||||||
import androidx.appcompat.app.AppCompatActivity
|
import androidx.appcompat.app.AppCompatActivity
|
||||||
import androidx.localbroadcastmanager.content.LocalBroadcastManager
|
|
||||||
import com.cute.girl.hd.pink.img.wallpaper.MyApp
|
|
||||||
import com.cute.girl.hd.pink.img.wallpaper.databinding.AbilityStartBinding
|
import com.cute.girl.hd.pink.img.wallpaper.databinding.AbilityStartBinding
|
||||||
import com.cute.girl.hd.pink.img.wallpaper.unityad.UnityAdManager
|
|
||||||
import com.cute.girl.hd.pink.img.wallpaper.unityad.onShowCallBack
|
|
||||||
|
|
||||||
class StartAbility : AppCompatActivity() {
|
class StartAbility : AppCompatActivity() {
|
||||||
private lateinit var binding: AbilityStartBinding
|
private lateinit var binding: AbilityStartBinding
|
||||||
@ -28,41 +20,7 @@ class StartAbility : AppCompatActivity() {
|
|||||||
binding = AbilityStartBinding.inflate(layoutInflater)
|
binding = AbilityStartBinding.inflate(layoutInflater)
|
||||||
setContentView(binding.root)
|
setContentView(binding.root)
|
||||||
|
|
||||||
countDownTimer = object : CountDownTimer(time, 100) {
|
setupViews()
|
||||||
override fun onTick(millisUntilFinished: Long) {
|
|
||||||
Log.d(
|
|
||||||
UnityAdManager.TAG,
|
|
||||||
"--------millisUntilFinished=${millisUntilFinished} $needShow"
|
|
||||||
)
|
|
||||||
if (needShow) {
|
|
||||||
onShowAd({
|
|
||||||
setupViews()
|
|
||||||
}, false)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun onFinish() {
|
|
||||||
Log.d(UnityAdManager.TAG, "--------onFinish needShow=${needShow}")
|
|
||||||
if (needShow) {
|
|
||||||
onShowAd({
|
|
||||||
setupViews()
|
|
||||||
}, true)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
if (MyApp.initSDK) {
|
|
||||||
Log.d(UnityAdManager.TAG, "--------initSDK true")
|
|
||||||
countDownTimer.start()
|
|
||||||
} else {
|
|
||||||
LocalBroadcastManager.getInstance(this).registerReceiver(object : BroadcastReceiver() {
|
|
||||||
override fun onReceive(context: Context?, intent: Intent?) {
|
|
||||||
Log.d(UnityAdManager.TAG, "--------onReceive")
|
|
||||||
countDownTimer.start()
|
|
||||||
}
|
|
||||||
|
|
||||||
}, IntentFilter(MyApp.AD_INIT_ACTION))
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -71,31 +29,6 @@ class StartAbility : AppCompatActivity() {
|
|||||||
finish()
|
finish()
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun onShowAd(action: () -> Unit, isFinish: Boolean) {
|
|
||||||
val readyUnitAd = UnityAdManager.getReadyUnitAd()
|
|
||||||
if (readyUnitAd != null) {
|
|
||||||
needShow = false
|
|
||||||
UnityAdManager.showUnityAd(this@StartAbility, readyUnitAd, object :
|
|
||||||
onShowCallBack {
|
|
||||||
override fun onShowFail() {
|
|
||||||
action.invoke()
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun onShowClose() {
|
|
||||||
action.invoke()
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun onShowSuccess() {
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
})
|
|
||||||
} else {
|
|
||||||
if (isFinish) {
|
|
||||||
action.invoke()
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
@ -1,132 +0,0 @@
|
|||||||
package com.cute.girl.hd.pink.img.wallpaper.unityad;
|
|
||||||
|
|
||||||
import android.app.Activity;
|
|
||||||
import android.util.Log;
|
|
||||||
|
|
||||||
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 = "5649501";
|
|
||||||
|
|
||||||
public static Boolean testMode = false;
|
|
||||||
|
|
||||||
public static String unitAd1 = "Art_Wallpaper_ad_unity_inst_open";
|
|
||||||
public static String unitAd2 = "Art_Wallpaper_ad_unity_inst_set";
|
|
||||||
public static String unitAd3 = "Art_Wallpaper_ad_unity_inst_theme";
|
|
||||||
|
|
||||||
public static Boolean AD1Ready = false;
|
|
||||||
public static Boolean AD2Ready = false;
|
|
||||||
public static Boolean AD3Ready = false;
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
public static String TAG = "-------TAG";
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
public static void loadAllAdNew() {
|
|
||||||
if (!AD1Ready)
|
|
||||||
loadAd(unitAd1);
|
|
||||||
if (!AD2Ready)
|
|
||||||
loadAd(unitAd2);
|
|
||||||
if (!AD3Ready)
|
|
||||||
loadAd(unitAd3);
|
|
||||||
}
|
|
||||||
|
|
||||||
public static String getReadyUnitAd() {
|
|
||||||
ArrayList<String> 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);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,8 +0,0 @@
|
|||||||
package com.cute.girl.hd.pink.img.wallpaper.unityad;
|
|
||||||
|
|
||||||
public interface onShowCallBack {
|
|
||||||
|
|
||||||
void onShowFail( );
|
|
||||||
void onShowClose( );
|
|
||||||
void onShowSuccess( );
|
|
||||||
}
|
|
||||||
Loading…
Reference in New Issue
Block a user