Commit d04cabf9 authored by wanglei's avatar wanglei

...

parent 6555efe1
...@@ -15,6 +15,7 @@ import com.base.datarecovery.ads.max.AdMaxOpenUtils ...@@ -15,6 +15,7 @@ import com.base.datarecovery.ads.max.AdMaxOpenUtils
import com.base.datarecovery.help.BaseApplication import com.base.datarecovery.help.BaseApplication
import com.base.datarecovery.help.ConfigHelper import com.base.datarecovery.help.ConfigHelper
import com.base.datarecovery.utils.AppPreferences import com.base.datarecovery.utils.AppPreferences
import com.base.datarecovery.utils.LogEx
import com.google.android.gms.ads.MobileAds import com.google.android.gms.ads.MobileAds
import java.util.concurrent.atomic.AtomicBoolean import java.util.concurrent.atomic.AtomicBoolean
...@@ -87,12 +88,12 @@ object AdmobMaxHelper { ...@@ -87,12 +88,12 @@ object AdmobMaxHelper {
} }
private fun getSpAdmobTrueMaxFalse(): Boolean { private fun getSpAdmobTrueMaxFalse(): Boolean {
val ss = AppPreferences.getInstance().getInt("admobTrueMaxFalse", 0) val ss = AppPreferences.getInstance().getString("admobTrueMaxFalse", "0").toInt()
return ss == 1 return ss == 1
} }
fun haveSpAdmobTrueMaxFalse(): Boolean { fun haveSpAdmobTrueMaxFalse(): Boolean {
return AppPreferences.getInstance().getInt("admobTrueMaxFalse", -1) != -1 return AppPreferences.getInstance().getString("admobTrueMaxFalse", "-1").toInt() != -1
} }
fun initAdmobMaxAd(activity: Activity? = null) { fun initAdmobMaxAd(activity: Activity? = null) {
...@@ -101,12 +102,14 @@ object AdmobMaxHelper { ...@@ -101,12 +102,14 @@ object AdmobMaxHelper {
} }
if (getSpAdmobTrueMaxFalse()) { if (getSpAdmobTrueMaxFalse()) {
LogEx.logDebug(TAG, "init sp Admob")
if (!isAdInit.get()) { if (!isAdInit.get()) {
MobileAds.initialize(BaseApplication.context) { initializationStatus -> MobileAds.initialize(BaseApplication.context) { initializationStatus ->
isAdInit.set(true) isAdInit.set(true)
} }
} }
} else { } else {
LogEx.logDebug(TAG, "init sp AdMax")
if (!isAdInit.get()) { if (!isAdInit.get()) {
BaseApplication.context.initAdMax() BaseApplication.context.initAdMax()
} }
......
...@@ -6,19 +6,14 @@ import android.annotation.SuppressLint ...@@ -6,19 +6,14 @@ import android.annotation.SuppressLint
import android.content.Intent import android.content.Intent
import android.view.View import android.view.View
import android.view.animation.AccelerateDecelerateInterpolator import android.view.animation.AccelerateDecelerateInterpolator
import com.base.datarecovery.activity.MainActivity
import com.base.datarecovery.activity.SettingActivity import com.base.datarecovery.activity.SettingActivity
import com.base.datarecovery.activity.appmanager.AppManagerActivity
import com.base.datarecovery.activity.appmanager.AppManagerAnimationActivity import com.base.datarecovery.activity.appmanager.AppManagerAnimationActivity
import com.base.datarecovery.activity.junkclean.ScanJunkActivity import com.base.datarecovery.activity.junkclean.ScanJunkActivity
import com.base.datarecovery.activity.largefile.LargeFileActivity
import com.base.datarecovery.activity.largefile.LargeFileAnimationActivity import com.base.datarecovery.activity.largefile.LargeFileAnimationActivity
import com.base.datarecovery.activity.photomanager.PhotoManagerAnimationActivity import com.base.datarecovery.activity.photomanager.PhotoManagerAnimationActivity
import com.base.datarecovery.activity.privacyspace.PrivacyPinOneActivity import com.base.datarecovery.activity.privacyspace.PrivacyPinOneActivity
import com.base.datarecovery.activity.privacyspace.PrivacySpaceActivity import com.base.datarecovery.activity.privacyspace.PrivacySpaceActivity
import com.base.datarecovery.activity.recovery.FileScanResultActivity import com.base.datarecovery.activity.recovery.FileScanResultActivity
import com.base.datarecovery.activity.repeat.RepeatAnimationActivity
import com.base.datarecovery.activity.screenshot.ScreenShotAnimationActivity
import com.base.datarecovery.activity.whatsapp.WhatsAppCleanerAnimationActivity import com.base.datarecovery.activity.whatsapp.WhatsAppCleanerAnimationActivity
import com.base.datarecovery.bean.ConstObject.SCAN_DOCUMENTS import com.base.datarecovery.bean.ConstObject.SCAN_DOCUMENTS
import com.base.datarecovery.bean.ConstObject.SCAN_PHOTOS import com.base.datarecovery.bean.ConstObject.SCAN_PHOTOS
......
...@@ -10,10 +10,10 @@ object LogEx { ...@@ -10,10 +10,10 @@ object LogEx {
"FileHexEx", "FileHexEx",
"FileGridAdapter", "FileGridAdapter",
"EventUtils", "EventUtils",
"ReportUtils" "ReportUtils",
) )
fun logDebug(tag: String, content: String, isMust: Boolean = true) { fun logDebug(tag: String, content: String, isMust: Boolean = false) {
if (isMust) { if (isMust) {
Log.e(tag, content) Log.e(tag, content)
} else { } else {
......
...@@ -17,6 +17,7 @@ import java.net.URL ...@@ -17,6 +17,7 @@ import java.net.URL
import java.util.Locale import java.util.Locale
object NewComUtils { object NewComUtils {
private val TAG = "NewComUtils"
private const val API_URL = ConfigHelper.apiUrl private const val API_URL = ConfigHelper.apiUrl
private const val PACKAGE_NAME_PREFIX = ConfigHelper.packageName private const val PACKAGE_NAME_PREFIX = ConfigHelper.packageName
private const val DATA_KEY = "data" private const val DATA_KEY = "data"
...@@ -88,6 +89,7 @@ object NewComUtils { ...@@ -88,6 +89,7 @@ object NewComUtils {
configMap.forEach { t, u -> configMap.forEach { t, u ->
// 对于整型值使用parseInt, 长整型使用parseLong // 对于整型值使用parseInt, 长整型使用parseLong
LogEx.logDebug(TAG, "t=$t u=$u")
AppPreferences.getInstance().put(t, u) AppPreferences.getInstance().put(t, u)
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment