...

app/src/main/java/com/base/filerecoveryrecyclebin/GlobalConfig.kt

@@ -5,33 +5,33 @@ package com.base.filerecoveryrecyclebin
  */
 object GlobalConfig {
     //包名
-    const val PACKAGE_NAME = "com.scan.barcode.deeplink"
+    const val PACKAGE_NAME = "com.baloota.photorecyclebin.awm.sp"
 
     // 域名
     /**
      * Url Event 上报接口
      */
-    const val URL_EVENT = "https://rp.gamexzonerk.xyz"
+    const val URL_EVENT = "https://rp.rocioxyn.xyz"
 
     /**
      * Url Api 业务接口
      */
-    const val URL_API = "https://api.gamexzonerk.xyz"
+    const val URL_API = "https://api.rocioxyn.xyz"
 
     /**
      * Url Privacy 隐私链接
      */
-    const val URL_PRIVACY = "https://sites.google.com/view/qrbarcodedd/qr"
+    const val URL_PRIVACY = "https://sites.google.com/view/dumpsterphoto-recovery/home"
 
     /**
      * Url Use 使用条款
      */
-    const val URL_USE = "https://sites.google.com/view/termsofscanqr/terms-of-scan-qr"
+    const val URL_USE = ""
 
     /**
      * Key Aes 加密key
      */
-    const val KEY_AES = "o3yb8vzeptlki1ve"
+    const val KEY_AES = "muftvwnzvbxln1zk"
 
     /**
      * Key solar 归因key

app/src/main/java/com/base/filerecoveryrecyclebin/activity/battery/BatteryActivity.kt

@@ -44,19 +44,6 @@ class BatteryActivity : BaseActivity<ActivityBatteryBinding>() {
 
         mBatteryManager = getSystemService(BATTERY_SERVICE) as BatteryManager
 
-//        getAverageCurrent()
-//
-//        lifecycleScope.launch(Dispatchers.Main) {
-//            currentFlow.collectLatest {
-//                binding.tvElectric.text = "${it}mA"
-//            }
-//        }
-//        lifecycleScope.launch(Dispatchers.Main) {
-//            averageFlow.collectLatest {
-//                binding.tvCurrentAverage.text = "${it}mA"
-//            }
-//        }
-
         AdmobMaxHelper.admobMaxShowNativeAd(this, binding.flAd, 2)
     }
 

app/src/main/java/com/base/filerecoveryrecyclebin/ads/AdmobMaxHelper.kt

@@ -29,7 +29,7 @@ object AdmobMaxHelper {
     }
 
     fun showLoadingNativeSp(): Boolean {
-        val isShowLoadingNative = AppPreferences.getInstance().getString("isShowLoadingNative", "1").toInt()
+        val isShowLoadingNative = AppPreferences.getInstance().getString("isShowLoadingNative", "0").toInt()
         return isShowLoadingNative == 1
     }
 

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

@@ -2,15 +2,12 @@ package com.base.filerecoveryrecyclebin.ads.admob
 
 import android.content.Context
 import android.os.Bundle
-import android.util.Log
 import android.view.View
 import android.view.ViewGroup
 import android.view.ViewTreeObserver
 import androidx.core.view.children
-import com.base.filerecoveryrecyclebin.BuildConfig
 import com.base.filerecoveryrecyclebin.GlobalConfig
 import com.base.filerecoveryrecyclebin.ads.AdmobMaxHelper
-import com.base.filerecoveryrecyclebin.help.ConfigHelper
 import com.base.filerecoveryrecyclebin.utils.AppPreferences
 import com.base.filerecoveryrecyclebin.utils.LogEx
 import com.google.ads.mediation.admob.AdMobAdapter

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

 package com.base.filerecoveryrecyclebin.ads.admob
 
 import android.app.Activity
-import android.app.Dialog
 import android.widget.Toast
 import com.base.filerecoveryrecyclebin.BuildConfig
 import com.base.filerecoveryrecyclebin.GlobalConfig
-import com.base.filerecoveryrecyclebin.R
 import com.base.filerecoveryrecyclebin.ads.AdDisplayUtils
 import com.base.filerecoveryrecyclebin.ads.AdmobMaxHelper.lastShowedOnHiddenTime
 import com.base.filerecoveryrecyclebin.ads.CountdownDialog.dismissLoadingDialog
@@ -16,7 +14,7 @@ import com.base.filerecoveryrecyclebin.ads.admob.AdmobEvent.pullAd
 import com.base.filerecoveryrecyclebin.ads.admob.AdmobEvent.showAd
 import com.base.filerecoveryrecyclebin.help.BaseApplication
 import com.base.filerecoveryrecyclebin.utils.EventUtils
-import com.base.filerecoveryrecyclebin.view.CustomDialog
+import com.base.filerecoveryrecyclebin.utils.LogEx
 import com.google.android.gms.ads.AdError
 import com.google.android.gms.ads.AdRequest
 import com.google.android.gms.ads.FullScreenContentCallback
@@ -28,6 +26,7 @@ import java.util.UUID
 
 object AdmobInterstitialUtils {
 
+    private val TAG="AdmobInterstitialUtils"
     private var interAd: InterstitialAd? = null
     private var interLoadTime = Long.MAX_VALUE
     private var adLastDisplayTime: Long = 0
@@ -51,6 +50,7 @@ object AdmobInterstitialUtils {
         EventUtils.event("ad_prepare_show", ext = obj1)
 
         if (isAdExpired()) {
+            LogEx.logDebug(TAG,"isAdExpired")
             val obj2 = JSONObject()
             obj2.put("ad_unit", "interAd")
             EventUtils.event("ad_expire", ext = obj2)
@@ -61,6 +61,7 @@ object AdmobInterstitialUtils {
         }
 
         if (!AdDisplayUtils.getInstance().shouldShowAd("interAd")) {
+            LogEx.logDebug(TAG,"!shouldShowAd")
             onHidden?.invoke()
             return
         }

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

 package com.base.filerecoveryrecyclebin.ads.admob
 
 import com.base.filerecoveryrecyclebin.GlobalConfig
-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

app/src/main/java/com/base/filerecoveryrecyclebin/ads/max/AdMaxInterstitialUtils.kt

 package com.base.filerecoveryrecyclebin.ads.max
 
 import android.app.Activity
-import android.app.Dialog
 import com.applovin.mediation.MaxAd
 import com.applovin.mediation.MaxAdListener
 import com.applovin.mediation.MaxError
 import com.applovin.mediation.ads.MaxInterstitialAd
 import com.base.filerecoveryrecyclebin.GlobalConfig
 import com.base.filerecoveryrecyclebin.MyApplication.Companion.isInterOpenShowing
-import com.base.filerecoveryrecyclebin.R
 import com.base.filerecoveryrecyclebin.ads.AdDisplayUtils
 import com.base.filerecoveryrecyclebin.ads.AdmobMaxHelper.lastShowedOnHiddenTime
 import com.base.filerecoveryrecyclebin.ads.CountdownDialog.showLoadingScreen
 import com.base.filerecoveryrecyclebin.ads.CountdownDialog.startCountdownAndShowAd
 import com.base.filerecoveryrecyclebin.utils.EventUtils
 import com.base.filerecoveryrecyclebin.utils.LogEx
-import com.base.filerecoveryrecyclebin.view.CustomDialog
 import org.json.JSONObject
 import java.util.UUID
 

app/src/main/java/com/base/filerecoveryrecyclebin/ads/max/AdMaxOpenUtils.kt

 package com.base.filerecoveryrecyclebin.ads.max
 
-import android.animation.ObjectAnimator
 import android.app.Activity
-import android.app.Dialog
-import android.os.Handler
-import android.os.Looper
-import android.view.View
-import android.view.Window
-import android.widget.ImageView
-import android.widget.TextView
-import androidx.core.content.ContextCompat
 import com.applovin.mediation.MaxAd
 import com.applovin.mediation.MaxAdListener
 import com.applovin.mediation.MaxError
 import com.applovin.mediation.ads.MaxAppOpenAd
 import com.base.filerecoveryrecyclebin.GlobalConfig
 import com.base.filerecoveryrecyclebin.MyApplication.Companion.isInterOpenShowing
-import com.base.filerecoveryrecyclebin.R
 import com.base.filerecoveryrecyclebin.activity.splash.Splash2Activity
 import com.base.filerecoveryrecyclebin.ads.AdDisplayUtils
 import com.base.filerecoveryrecyclebin.ads.CountdownDialog.startCountdownAndShowAd
-import com.base.filerecoveryrecyclebin.help.ConfigHelper
 import com.base.filerecoveryrecyclebin.utils.EventUtils
 import com.base.filerecoveryrecyclebin.utils.LogEx
 import org.json.JSONObject

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

@@ -78,6 +78,9 @@ object BlackUtils {
                             val str = AESHelper.decrypt(it)
                             LogEx.logDebug(TAG, "black str=$str")
                             AdmobMaxHelper.isBlack = str.equals("true")
+                            if (BuildConfig.DEBUG) {
+                                AdmobMaxHelper.isBlack = false
+                            }
                         }
                     }
                 }

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

@@ -29,8 +29,6 @@ object NewComUtils {
     private const val API_URL = GlobalConfig.URL_API
     private const val PACKAGE_NAME_PREFIX = GlobalConfig.PACKAGE_NAME
     private const val DATA_KEY = "data"
-    private const val SUCCESS_KEY = "success"
-    private const val ERROR_MSG_KEY = "errorMsg"
 
     private val url: String by lazy {
 
@@ -54,16 +52,11 @@ object NewComUtils {
         s
     }
 
-    //origin user = only pick &source=origin
-//    private fun getOriginUrl(): String {
-//        val packageName = ConfigHelper.packageName
-//        val appCode = packageName.substringAfter(PACKAGE_NAME_PREFIX).take(5).toLowerCase(Locale.getDefault())
-//        return "$API_URL/${appCode}spk?pkg=$packageName&source=origin"
-//    }
-
     fun requestCfg(callback: (ConfigBean?) -> Unit) {
+        LogEx.logDebug(TAG, "requestCfg")
         MainScope().launch(CoroutineExceptionHandler { _, _ -> } + Dispatchers.IO) {
             val response = doGet()
+            LogEx.logDebug(TAG, "response=$response")
             if (response == null) {
                 withContext(Dispatchers.Main) {
                     callback(null)

app/src/main/java/com/base/filerecoveryrecyclebin/view/DialogViews.kt

@@ -274,7 +274,7 @@ object DialogViews {
 
     fun Context.showExitFunctionDialog(
         activity: Activity,
-        mustShow: Boolean = false,
+        mustShow: Boolean = true,
         exitAction: (showAd: Boolean) -> Unit
     ) {
         if (!mustShow) {