Merge remote-tracking branch 'origin/free-master-ad-legal' into free-master-ad-legal

app/src/main/java/com/test/easy/easycleanerjunk/activity/photocompress/photo/CompressioningActivity.kt

@@ -15,7 +15,8 @@ import com.test.easy.easycleanerjunk.helps.ads.AdmobUtils
 import com.test.easy.easycleanerjunk.utils.BarUtils
 import com.test.easy.easycleanerjunk.view.AFunOb
 
-class CompressioningActivity : BaseActivity<ActivityCompressioningBinding>(), CompressionImageUtils.BitmapCallback,
+class CompressioningActivity : BaseActivity<ActivityCompressioningBinding>(),
+    CompressionImageUtils.BitmapCallback,
     CompressionImageUtils.OnSaveBitmapListener {
 
 
@@ -28,6 +29,7 @@ class CompressioningActivity : BaseActivity<ActivityCompressioningBinding>(), Co
     override val binding: ActivityCompressioningBinding by lazy {
         ActivityCompressioningBinding.inflate(layoutInflater)
     }
+
     override fun initView() {
         BarUtils.setStatusBarLightMode(this, true)
         BarUtils.setStatusBarColor(this, Color.TRANSPARENT)
@@ -57,7 +59,6 @@ class CompressioningActivity : BaseActivity<ActivityCompressioningBinding>(), Co
     }
 
 
-
     override fun onDestroy() {
         super.onDestroy()
         binding.compressingAnimation.clearAnimation()
@@ -77,19 +78,21 @@ class CompressioningActivity : BaseActivity<ActivityCompressioningBinding>(), Co
         mTextProgress?.text = mNum.toString() + "/" + PhotoCache.getInstance().count
         mProgressBar?.progress = mNum
         if (mNum == mProgressBar?.max) {
+            mProgressBar?.postDelayed({
                 onSuccess()
+            }, 1500)
         }
     }
 
     private fun onSuccess() {
-        AdmobUtils.showInterstitialAd(this){
+//        AdmobUtils.showInterstitialAd(this){
         val intent = Intent(this, ResultActivity::class.java)
         intent.putExtra("from", AFunOb.PHOTO_COMPRESS)
         intent.putExtra("num", mNum)
         intent.putExtra("size", mSizeCount)
         startActivity(intent)
         finish()
-        }
+//        }
 
     }
 

app/src/main/java/com/test/easy/easycleanerjunk/activity/photocompress/photo/PreviewCompressionPhotoActivity.kt

@@ -7,6 +7,7 @@ import androidx.core.view.updatePadding
 import com.test.easy.easycleanerjunk.R
 import com.test.easy.easycleanerjunk.databinding.ActivityPreviewCompressionPhotoBinding
 import com.test.easy.easycleanerjunk.helps.BaseActivity
+import com.test.easy.easycleanerjunk.helps.ads.AdmobUtils
 import com.test.easy.easycleanerjunk.utils.BarUtils
 
 
@@ -37,13 +38,15 @@ class PreviewCompressionPhotoActivity : BaseActivity<ActivityPreviewCompressionP
             }
 
             dialog.setButtonClickListener(R.id.btnContinue) {
+                dialog.dismiss()
+                AdmobUtils.showInterstitialAd(this) {
                     CompressionPhotoListActivity.mActivity?.finish()
                     val intent = Intent(this, CompressioningActivity::class.java)
                     intent.putExtra("mode", manager.getMode())
                     startActivity(intent)
-                dialog.dismiss()
                     finish()
                 }
+            }
             dialog.show()
         }
     }