From 3328827ab6513a9c4fe68d0a6709b69c7467f2cf Mon Sep 17 00:00:00 2001
From: ocean <503259349@qq.com>
Date: Thu, 18 Jul 2024 17:38:19 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0ump?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle.kts                            |  2 ++
 .../offline/music/activity/PrimaryActivity.kt   |  3 +++
 .../music/ads/GoogleMobileAdsConsentManager.kt  | 17 ++++++++++-------
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 4cf6f4c..68d05d3 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -101,6 +101,8 @@ dependencies {
     implementation("io.github.scwang90:refresh-footer-ball:2.1.0")
     implementation("com.google.code.gson:gson:2.10.1")
 
+    implementation("com.google.android.ump:user-messaging-platform:3.0.0")
+
     //fb
     implementation("com.facebook.android:facebook-android-sdk:latest.release")
     //google
diff --git a/app/src/main/java/melody/offline/music/activity/PrimaryActivity.kt b/app/src/main/java/melody/offline/music/activity/PrimaryActivity.kt
index bb2aa78..af46d1f 100644
--- a/app/src/main/java/melody/offline/music/activity/PrimaryActivity.kt
+++ b/app/src/main/java/melody/offline/music/activity/PrimaryActivity.kt
@@ -12,6 +12,8 @@ import melody.offline.music.fragment.MoMeFragment
 import melody.offline.music.fragment.SearchFragment
 import kotlinx.coroutines.isActive
 import kotlinx.coroutines.selects.select
+import melody.offline.music.ads.GoogleMobileAdsConsentManager
+import melody.offline.music.util.LogTag
 
 class PrimaryActivity : MoBaseActivity(), SearchFragment.SearchFragmentCancelClickListener ,MoHomeFragment.MoHomeFragmentToSearchClickListener{
     /**
@@ -42,6 +44,7 @@ class PrimaryActivity : MoBaseActivity(), SearchFragment.SearchFragmentCancelCli
     private fun initView() {
         initFragment()
         initClick()
+        GoogleMobileAdsConsentManager.getInstance(this).gatherConsent(this)
     }
 
     private fun initClick() {
diff --git a/app/src/main/java/melody/offline/music/ads/GoogleMobileAdsConsentManager.kt b/app/src/main/java/melody/offline/music/ads/GoogleMobileAdsConsentManager.kt
index f2eaae0..7097254 100644
--- a/app/src/main/java/melody/offline/music/ads/GoogleMobileAdsConsentManager.kt
+++ b/app/src/main/java/melody/offline/music/ads/GoogleMobileAdsConsentManager.kt
@@ -1,4 +1,4 @@
-package pkg.com.master.ae.safevpn.ads
+package melody.offline.music.ads
 
 import android.app.Activity
 import android.content.Context
@@ -23,7 +23,7 @@ class GoogleMobileAdsConsentManager private constructor(context: Context) {
         fun consentGatheringComplete(error: FormError?)
     }
 
-    fun reset(){
+    fun reset() {
         consentInformation.reset()
     }
 
@@ -43,7 +43,7 @@ class GoogleMobileAdsConsentManager private constructor(context: Context) {
      */
     fun gatherConsent(
         activity: Activity,
-        onConsentGatheringCompleteListener: OnConsentGatheringCompleteListener
+        onConsentGatheringCompleteListener: OnConsentGatheringCompleteListener? = null
     ) {
         // For testing purposes, you can force a DebugGeography of EEA or NOT_EEA.
         val debugSettings =
@@ -57,7 +57,9 @@ class GoogleMobileAdsConsentManager private constructor(context: Context) {
                 .build()
 
 
-        val params = ConsentRequestParameters.Builder().setConsentDebugSettings(debugSettings).build()
+        val params = ConsentRequestParameters.Builder()
+//                .setConsentDebugSettings(debugSettings)
+                .build()
         // Requesting an update to consent information should be called on every app launch.
         consentInformation.requestConsentInfoUpdate(
             activity,
@@ -65,11 +67,11 @@ class GoogleMobileAdsConsentManager private constructor(context: Context) {
             {
                 UserMessagingPlatform.loadAndShowConsentFormIfRequired(activity) { formError ->
                     // Consent has been gathered.
-                    onConsentGatheringCompleteListener.consentGatheringComplete(formError)
+                    onConsentGatheringCompleteListener?.consentGatheringComplete(formError)
                 }
             },
             { requestConsentError ->
-                onConsentGatheringCompleteListener.consentGatheringComplete(requestConsentError)
+                onConsentGatheringCompleteListener?.consentGatheringComplete(requestConsentError)
             }
         )
     }
@@ -83,7 +85,8 @@ class GoogleMobileAdsConsentManager private constructor(context: Context) {
     }
 
     companion object {
-        @Volatile private var instance: GoogleMobileAdsConsentManager? = null
+        @Volatile
+        private var instance: GoogleMobileAdsConsentManager? = null
 
         fun getInstance(context: Context) =
             instance