...隐藏订阅

app/src/main/AndroidManifest.xml

@@ -55,12 +55,12 @@
             android:launchMode="singleTop"
             android:screenOrientation="portrait"
             tools:ignore="DiscouragedApi,LockedOrientationActivity" />
-        <activity
-            android:name=".activity.vip.VipActivity"
-            android:exported="false"
-            android:launchMode="singleTop"
-            android:screenOrientation="portrait"
-            tools:ignore="DiscouragedApi,LockedOrientationActivity" />
+<!--        <activity-->
+<!--            android:name=".activity.vip.VipActivity"-->
+<!--            android:exported="false"-->
+<!--            android:launchMode="singleTop"-->
+<!--            android:screenOrientation="portrait"-->
+<!--            tools:ignore="DiscouragedApi,LockedOrientationActivity" />-->
         <activity
             android:name=".activity.recyclebin.RecycleBinDetailActivity"
             android:exported="false"

app/src/main/java/com/base/filerecoveryrecyclebin/activity/SplashActivity.kt

@@ -17,14 +17,7 @@ import com.base.filerecoveryrecyclebin.activity.privacyspace.PrivacySpaceActivit
 import com.base.filerecoveryrecyclebin.activity.recovery.FileScanResultActivity
 import com.base.filerecoveryrecyclebin.activity.repeat.RepeatActivity
 import com.base.filerecoveryrecyclebin.activity.screenshot.ScreenShotActivity
-import com.base.filerecoveryrecyclebin.activity.vip.VipActivity
 import com.base.filerecoveryrecyclebin.ads.AdmobMaxHelper
-import com.base.filerecoveryrecyclebin.ads.admob.AdmobInterstitialUtils
-import com.base.filerecoveryrecyclebin.ads.admob.AdmobNativeUtils
-import com.base.filerecoveryrecyclebin.ads.max.AdMaxInit
-import com.base.filerecoveryrecyclebin.ads.max.AdMaxInterstitialUtils
-import com.base.filerecoveryrecyclebin.ads.max.AdMaxNativeUtils
-import com.base.filerecoveryrecyclebin.ads.max.AdMaxOpenUtils
 import com.base.filerecoveryrecyclebin.bean.ConstObject
 import com.base.filerecoveryrecyclebin.bean.ConstObject.ID_JUNK_CLEAN_PUSH
 import com.base.filerecoveryrecyclebin.bean.ConstObject.ID_PRIVACY_SPACE

app/src/main/java/com/base/filerecoveryrecyclebin/activity/vip/VipActivity.kt

@@ -12,42 +12,42 @@ import com.base.filerecoveryrecyclebin.databinding.ActivityVipBinding
 import com.base.filerecoveryrecyclebin.help.BaseActivity
 import com.base.filerecoveryrecyclebin.utils.BarUtils
 
-class VipActivity : BaseActivity<ActivityVipBinding>() {
-
-    override val binding: ActivityVipBinding by lazy {
-        ActivityVipBinding.inflate(layoutInflater)
-    }
-
-    override fun initView() {
-        BarUtils.setStatusBarLightMode(this, true)
-        BarUtils.setStatusBarColor(this, Color.WHITE)
-        binding.root.updatePadding(top = BarUtils.getStatusBarHeight())
-
-        val isSkip = intent.extras?.getBoolean("isSkip") ?: false
-        binding.tvSkip.isVisible = isSkip
-    }
-
-    override fun initListener() {
-        super.initListener()
-
-        binding.cardWeek.setOnClickListener { }
-        binding.cardMonth.setOnClickListener { }
-        binding.cardYear.setOnClickListener { }
-
-        onBackPressedDispatcher.addCallback {
-            AdmobMaxHelper.admobMaxShowInterstitialAd(this@VipActivity) {
-                startActivity(Intent(this@VipActivity, MainActivity::class.java))
-                finish()
-            }
-        }
-        binding.flQuit.setOnClickListener {
-            onBackPressedDispatcher.onBackPressed()
-        }
-        binding.tvSkip.setOnClickListener {
-            onBackPressedDispatcher.onBackPressed()
-        }
-
-    }
-
-
-}
+//class VipActivity : BaseActivity<ActivityVipBinding>() {
+//
+//    override val binding: ActivityVipBinding by lazy {
+//        ActivityVipBinding.inflate(layoutInflater)
+//    }
+//
+//    override fun initView() {
+//        BarUtils.setStatusBarLightMode(this, true)
+//        BarUtils.setStatusBarColor(this, Color.WHITE)
+//        binding.root.updatePadding(top = BarUtils.getStatusBarHeight())
+//
+//        val isSkip = intent.extras?.getBoolean("isSkip") ?: false
+//        binding.tvSkip.isVisible = isSkip
+//    }
+//
+//    override fun initListener() {
+//        super.initListener()
+//
+//        binding.cardWeek.setOnClickListener { }
+//        binding.cardMonth.setOnClickListener { }
+//        binding.cardYear.setOnClickListener { }
+//
+//        onBackPressedDispatcher.addCallback {
+//            AdmobMaxHelper.admobMaxShowInterstitialAd(this@VipActivity) {
+//                startActivity(Intent(this@VipActivity, MainActivity::class.java))
+//                finish()
+//            }
+//        }
+//        binding.flQuit.setOnClickListener {
+//            onBackPressedDispatcher.onBackPressed()
+//        }
+//        binding.tvSkip.setOnClickListener {
+//            onBackPressedDispatcher.onBackPressed()
+//        }
+//
+//    }
+//
+//
+//}
\ No newline at end of file

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

 package com.base.filerecoveryrecyclebin.ads.max
+
 import android.app.Activity
 import com.applovin.mediation.MaxAd
 import com.applovin.mediation.MaxAdListener
@@ -127,9 +128,9 @@ object AdMaxOpenUtils {
             appOpenAd?.showAd()
         } else {
             val obj = JSONObject()
-            obj.put("reason", "no ad")
+            obj.put("reason", "no cache ad")
             obj.put("ad_unit", "openAd")
-            EventUtils.event("ad_show_error", ext = obj)
+            EventUtils.event("ad_nocache_pull", ext = obj)
             LogEx.logDebug(TAG, "展示时候，发现广告需要拉取")
             val loaded = loadAppOpenAd(activity)
             if (loaded) {

app/src/main/java/com/base/filerecoveryrecyclebin/billing/BillingViewModel.kt

+package com.base.filerecoveryrecyclebin.billing
+
+import android.app.Application
+import androidx.lifecycle.AndroidViewModel
+
+class BillingViewModel(application: Application):AndroidViewModel(application) {
+
+
+}
\ No newline at end of file

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

@@ -2,14 +2,10 @@ package com.base.filerecoveryrecyclebin.fragment
 
 import android.annotation.SuppressLint
 import android.content.Intent
-import android.view.View
 import com.base.filerecoveryrecyclebin.R
 import com.base.filerecoveryrecyclebin.activity.MainActivity
 import com.base.filerecoveryrecyclebin.activity.guide.GuideActivity
-import com.base.filerecoveryrecyclebin.activity.vip.VipActivity
 import com.base.filerecoveryrecyclebin.ads.AdmobMaxHelper
-import com.base.filerecoveryrecyclebin.bean.ConstObject.isGuide
-import com.base.filerecoveryrecyclebin.bean.ConstObject.isInstallVip
 import com.base.filerecoveryrecyclebin.databinding.FragmentGuideBinding
 import com.base.filerecoveryrecyclebin.help.BaseFragment
 import com.base.filerecoveryrecyclebin.utils.AppPreferences
@@ -49,12 +45,12 @@ class GuideFragment constructor() : BaseFragment<FragmentGuideBinding>() {
     }
 
     private fun jumpNext() {
-        if (isInstallVip) {
-            startActivity(Intent(requireContext(), VipActivity::class.java).apply {
-                putExtra("isSkip", true)
-            })
-            requireActivity().finish()
-            isInstallVip = false
+        if (false) {
+//            startActivity(Intent(requireContext(), VipActivity::class.java).apply {
+//                putExtra("isSkip", true)
+//            })
+//            requireActivity().finish()
+//            isInstallVip = false
         } else {
             val showAd = AppPreferences.getInstance().getString("isShowGuideAd", "0")?.toInt()
             if (showAd == 1) {

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

@@ -8,10 +8,8 @@ import androidx.lifecycle.lifecycleScope
 import com.base.filerecoveryrecyclebin.activity.MainActivity
 import com.base.filerecoveryrecyclebin.activity.SettingActivity
 import com.base.filerecoveryrecyclebin.activity.junkclean.ScanJunkActivity
-import com.base.filerecoveryrecyclebin.activity.photomanager.PhotoManagerActivity
 import com.base.filerecoveryrecyclebin.activity.photomanager.PhotoManagerAnimationActivity
 import com.base.filerecoveryrecyclebin.activity.recovery.FileScanResultActivity
-import com.base.filerecoveryrecyclebin.activity.vip.VipActivity
 import com.base.filerecoveryrecyclebin.activity.whatsapp.WhatsAppCleanerAnimationActivity
 import com.base.filerecoveryrecyclebin.bean.ConstObject.SCAN_AUDIOS
 import com.base.filerecoveryrecyclebin.bean.ConstObject.SCAN_DOCUMENTS
@@ -20,7 +18,6 @@ import com.base.filerecoveryrecyclebin.bean.ConstObject.SCAN_VIDEOS
 import com.base.filerecoveryrecyclebin.databinding.FragmentHome3Binding
 import com.base.filerecoveryrecyclebin.help.BaseFragment
 import com.base.filerecoveryrecyclebin.help.KotlinExt.toFormatSize
-import com.base.filerecoveryrecyclebin.help.PermissionHelp.checkStorePermission
 import com.base.filerecoveryrecyclebin.utils.LogEx
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.collectLatest
@@ -74,9 +71,9 @@ class HomeFragment : BaseFragment<FragmentHome3Binding>() {
         binding.flSetting.setOnClickListener {
             startActivity(Intent(requireContext(), SettingActivity::class.java))
         }
-        binding.ivVip.setOnClickListener {
-            startActivity(Intent(requireContext(), VipActivity::class.java))
-        }
+//        binding.ivVip.setOnClickListener {
+//            startActivity(Intent(requireContext(), VipActivity::class.java))
+//        }
 
         lifecycleScope.launch(Dispatchers.Main) {
             (requireActivity() as MainActivity).photoSizeFlow.collectLatest {

app/src/main/res/layout/fragment_home_3.xml

@@ -44,6 +44,7 @@
                         android:layout_gravity="center_vertical"
                         android:layout_marginEnd="5dp"
                         android:src="@mipmap/h_vipicon"
+                        android:visibility="gone"
                         tools:ignore="ContentDescription" />
 
                     <FrameLayout
@@ -69,11 +70,11 @@
 
 
             <FrameLayout
-                android:layout_marginTop="-20dp"
                 android:id="@+id/fl_scan"
                 android:layout_width="280dp"
                 android:layout_height="280dp"
-                android:layout_gravity="center_horizontal">
+                android:layout_gravity="center_horizontal"
+                android:layout_marginTop="-20dp">
 
                 <com.base.filerecoveryrecyclebin.view.XmlLottieAnimationView
                     android:id="@+id/lottie"