Merge remote-tracking branch 'origin/master'

app/google-services.json

@@ -9,7 +9,7 @@
       "client_info": {
         "mobilesdk_app_id": "1:944507974954:android:1309986ccc55e242589a53",
         "android_client_info": {
-          "package_name": "com.baloota.photorecyclebin.awm.sp"
+          "package_name": "confine.scream"
         }
       },
       "oauth_client": [],

app/src/main/AndroidManifest.xml

@@ -313,7 +313,7 @@
         <!-- Sample AdMob App ID: ca-app-pub-3940256099942544~3347511713 -->
         <meta-data
             android:name="com.google.android.gms.ads.APPLICATION_ID"
-            android:value="ca-app-pub-3838048042416287~9437965450" />
+            android:value="ca-app-pub-3940256099942544~3347511713" />
         <meta-data
             android:name="com.facebook.sdk.ApplicationId"
             android:value="@string/facebook_app_id" />

app/src/main/java/com/base/filerecoveryrecyclebin/ads/admob/AdmobEvent.kt

@@ -99,6 +99,7 @@ object AdmobEvent {
                 )
                 roasbundle.putString(FirebaseAnalytics.Param.CURRENCY, "USD")
                 Firebase.analytics.logEvent("Total_Ads_Revenue_001", roasbundle)
+                SolarEngineEvent.eventSolar(ad, valueMicros)
                 taichiSharedPreferencesEditor.putFloat("TaichiTroasCache", 0f)//重新清零，开始计算
 
                 val logger = AppEventsLogger.newLogger(BaseApplication.context)

app/src/main/java/com/base/filerecoveryrecyclebin/ads/admob/SolarEngineEvent.kt

+package com.base.filerecoveryrecyclebin.ads.admob
+
+import com.base.filerecoveryrecyclebin.help.ConfigHelper
+import com.google.android.gms.ads.appopen.AppOpenAd
+import com.google.android.gms.ads.interstitial.InterstitialAd
+import com.google.android.gms.ads.nativead.NativeAd
+import com.google.android.gms.ads.rewarded.RewardedAd
+import com.reyun.solar.engine.SolarEngineManager
+import com.reyun.solar.engine.infos.SEAdImpEventModel
+import org.json.JSONObject
+
+/**
+ * https://help.solar-engine.com/cn/docs/yu-ding-yi-shi-jian
+ */
+object SolarEngineEvent {
+
+    fun eventSolar(ad: Any?, valueMicros: Long) = Thread {
+
+        val json = JSONObject()
+        //变现平台
+        var adNetworkPlatform = "AdMob"
+        //聚合平台标识
+        var mediationPlatform = "admob"
+        //广告的类型
+//        adType 为激励视频时，只需要传入 1
+//        1：激励视频
+//        2：开屏
+//        3：插屏
+//        4：全屏视频
+//        5：Banner
+//        6：信息流
+//        7：短视频信息流
+//        8：大横幅
+//        9：视频贴片
+//        10：中等尺寸横幅
+//        0：其它
+        var adType = -1
+        //变现平台的应用 ID
+        var adNetworkAppID = ConfigHelper.ID_ADMOB_APPLICATION
+        //变现平台的变现广告位 ID
+        var adNetworkADID = ""
+        //广告 ecpm，单位：元（广告千次展现的变现收入，0或负值表示没传，单位为元）
+        var ecpm = valueMicros / 1000.0
+        //货币种类
+        var currencyType = "USD"
+
+        when (ad) {
+            is AppOpenAd -> {
+                adType = 2
+                adNetworkADID = ad.adUnitId
+            }
+
+            is InterstitialAd -> {
+                adType = 3
+                adNetworkADID = ad.adUnitId
+            }
+
+            is NativeAd -> {
+                adType = 6
+                adNetworkADID = ConfigHelper.nativeAdmobId
+            }
+
+            is RewardedAd -> {
+                adType = 1
+                adNetworkADID = ad.adUnitId
+            }
+
+            else -> { //banner
+                adType = 5
+                adNetworkADID = ConfigHelper.bannerAdmobId
+            }
+        }
+
+        try {
+        } catch (e: Exception) {
+            //
+        }
+        val seAdImpEventModel = SEAdImpEventModel(
+            adNetworkPlatform,
+            mediationPlatform,
+            adType,
+            adNetworkAppID,
+            adNetworkADID,
+            ecpm,
+            currencyType,
+            true,
+            json
+        )
+        SolarEngineManager.getInstance().trackAdImpression(seAdImpEventModel)
+    }.start()
+}
\ No newline at end of file

app/src/main/java/com/base/filerecoveryrecyclebin/fcm/FCMManager.kt

@@ -51,11 +51,13 @@ object FCMManager {
                     // Get new FCM registration token
                     val token: String = task.result
                     LogEx.logDebug("FCM", "token=$token")
-                    val json = JSONObject()
-                    json.put("token", token)
-                    event("fcm_message_received", ext = json)
+                    if(token!= AppPreferences.getInstance().getString("token", "")){
+                        val json = JSONObject()
+                        json.put("token", token)
+                        event("fcm_message_received", ext = json)
+                        AppPreferences.getInstance().put("token", token)
+                    }
 
-                    AppPreferences.getInstance().put("token", token)
 
                     // Handle new token
                     Log.d("FCM", "FCM Registration Token: $token")

app/src/main/java/com/base/filerecoveryrecyclebin/fragment/GuideFragment.kt

@@ -5,6 +5,7 @@ import android.content.Intent
 import androidx.core.view.isVisible
 import com.base.filerecoveryrecyclebin.R
 import com.base.filerecoveryrecyclebin.activity.MainActivity
+import com.base.filerecoveryrecyclebin.activity.guide.CleanGuideActivity
 import com.base.filerecoveryrecyclebin.activity.guide.GuideActivity
 import com.base.filerecoveryrecyclebin.ads.AdmobMaxHelper
 import com.base.filerecoveryrecyclebin.databinding.FragmentGuideBinding
@@ -52,14 +53,15 @@ class GuideFragment : BaseFragment<FragmentGuideBinding>() {
             } else if (page == 2) {
                 (requireActivity() as GuideActivity).setPosition(2)
             } else {
-                jumpNext()
+                (requireActivity() as GuideActivity).lauchPermisson()
             }
         }
         binding.idTvAllow.setOnClickListener {
             (requireActivity() as GuideActivity).lauchPermisson()
         }
         binding.idTvNotAllow.setOnClickListener {
-            jumpNext()
+            startActivity(Intent(requireContext(), MainActivity::class.java))
+            requireActivity().finish()
         }
     }
 
@@ -67,11 +69,11 @@ class GuideFragment : BaseFragment<FragmentGuideBinding>() {
         val showAd = AppPreferences.getInstance().getString("isShowGuideAd", "0")?.toInt()
         if (showAd == 1) {
             AdmobMaxHelper.admobMaxShowInterstitialAd(requireActivity(), isLoading = false) {
-                startActivity(Intent(requireContext(), MainActivity::class.java))
+                startActivity(Intent(requireContext(), CleanGuideActivity::class.java))
                 requireActivity().finish()
             }
         } else {
-            startActivity(Intent(requireContext(), MainActivity::class.java))
+            startActivity(Intent(requireContext(), CleanGuideActivity::class.java))
             requireActivity().finish()
         }
     }

app/src/main/java/com/base/filerecoveryrecyclebin/help/ConfigHelper.kt

@@ -16,12 +16,13 @@ object ConfigHelper {
     const val bannerAdmobIdTest = "ca-app-pub-3940256099942544/9214589741"
     const val interAdmobIdTest = "ca-app-pub-3940256099942544/1033173712"
     const val nativeAdmobIdTest = "ca-app-pub-3940256099942544/2247696110"
+    inline val ID_ADMOB_APPLICATION get() = "ca-app-pub-3940256099942544~3347511713"
 
     // admob广告id
-    const val interAdmobId = "ca-app-pub-3838048042416287/8234531162"
-    const val nativeAdmobId = "ca-app-pub-3838048042416287/6196724440"
-    const val openAdmobId = "ca-app-pub-3838048042416287/8720350971"
-    const val bannerAdmobId = "ca-app-pub-3838048042416287/6921449490"
+    const val interAdmobId = "ca-app-pub-3940256099942544/1033173712"
+    const val nativeAdmobId = "ca-app-pub-3940256099942544/2247696110"
+    const val openAdmobId = "ca-app-pub-3940256099942544/9257395921"
+    const val bannerAdmobId = "ca-app-pub-3940256099942544/9214589741"
 
     //max id
     const val interAdMaxId = "b31e7f6d11ee659e"

app/src/main/java/com/base/filerecoveryrecyclebin/help/NewComUtils.kt

@@ -44,7 +44,6 @@ object NewComUtils {
         }&aid=${AppPreferences.getInstance().getString("uuid", "")}"
 
 
-//        &mode=3
     }
 
     //origin user = only pick &source=origin

app/src/main/java/com/base/filerecoveryrecyclebin/utils/EventUtils.kt

@@ -12,6 +12,20 @@ import java.util.Locale
 
 object EventUtils {
     private val TAG = "EventUtils"
+    private val push_limit by lazy {
+        listOf(
+            "showNotification",
+            "Notification_Popup",
+            "alarm_push",
+            "FCM_Received",
+            "workmanager_live",
+            "workmanager",
+            "Notification_Error",
+            "alarm_push2"
+        )
+    }
+    val isPushReportSwitch
+        get() = AppPreferences.getInstance().getString("push_report_switch", "0").toInt()
     fun event(
         key: String,
         value: String? = null,
@@ -22,6 +36,9 @@ object EventUtils {
         if (!ifAgreePrivacy) {
             return
         }
+        if (isPushReportSwitch==0 && push_limit.any { key.startsWith(it, ignoreCase = true) }) {
+            return
+        }
 
         if (isSingleEvent) {
             val stringSet = AppPreferences.getInstance().getStringSet("singleEvent", setOf())