V1.0.6(7) 广告场景：开屏、分类进入列表、保存按钮点击、设置壁纸弹窗上的三个按钮点击

app/build.gradle.kts

@@ -20,8 +20,8 @@ android {
         applicationId = "com.wallart.art.wallpapers.hd"
         minSdk = 23
         targetSdk = 34
-        versionCode =6
+        versionCode =7
-        versionName = "1.0.5"
+        versionName = "1.0.6"
         setProperty("archivesBaseName", "Art Wallpaper_V" + versionName + "(${versionCode})_$timestamp")
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }

app/src/main/java/com/cute/girl/hd/pink/img/wallpaper/page/CategoryAbility.kt

@@ -14,6 +14,7 @@ import com.cute.girl.hd.pink.img.wallpaper.entity.CategoryPreviewBean
 import com.cute.girl.hd.pink.img.wallpaper.db.Data
 import com.cute.girl.hd.pink.img.wallpaper.entity.GCategoryDetail
 import com.cute.girl.hd.pink.img.wallpaper.entity.IntentConstants
+import com.cute.girl.hd.pink.img.wallpaper.topon.AdManager
 //import com.cute.girl.hd.pink.img.wallpaper.net.base.BaseListener
 //import com.cute.girl.hd.pink.img.wallpaper.net.base.ServiceImage
 //import com.cute.girl.hd.pink.img.wallpaper.net.response.ResponseCategoryDetail
@@ -45,6 +46,7 @@ class CategoryAbility : AppCompatActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        AdManager.loadAllAd()
         binding = AbilityCategoryBinding.inflate(layoutInflater)
 
         mViewModel = ViewModelProvider(this).get(CategoryListViewModel::class.java)

app/src/main/java/com/cute/girl/hd/pink/img/wallpaper/page/MainAbility.kt

@@ -86,10 +86,10 @@ class MainAbility : AppCompatActivity() {
         return try {
             val pm: PackageManager = this.packageManager
             val pi = pm.getPackageInfo(this.packageName, 0)
-            if (pi == null) "" else pi.versionName
+            if (pi == null) "1.0.6" else pi.versionName
         } catch (e: PackageManager.NameNotFoundException) {
             e.printStackTrace()
-            ""
+            "1.0.6"
         }
     }
 

app/src/main/java/com/cute/girl/hd/pink/img/wallpaper/page/PreviewAbility.kt

@@ -93,7 +93,7 @@ class PreviewAbility : AppCompatActivity(), EasyPermissions.PermissionCallbacks
             finish()
             return
         }
-        MyDatabase.myDatabase.WallpaperDao().queryWallpaper(listBean!!.id).observe(this){
+        MyDatabase.myDatabase.WallpaperDao().queryWallpaper(listBean!!.id).observe(this) {
             binding.imLike.isSelected = it.like
         }
 
@@ -134,47 +134,45 @@ class PreviewAbility : AppCompatActivity(), EasyPermissions.PermissionCallbacks
 
     }
 
-    private fun onClick(){
+    private fun onClick() {
         binding.ivBack.setOnClickListener {
             finish()
         }
 
         binding.tvSet.setOnClickListener {
-            showTopOn {
             mAction = 0
             if (isExist()) {
                 set4KWallpaper()
             } else {
                 startDownload()
             }
-            }
+
 
         }
 
         binding.tvDownload.setOnClickListener {
-            showTopOn{
+            showTopOn {
                 doSave()
             }
 
         }
 
         binding.imLike.setOnClickListener {
-            showTopOn{
+
             binding.imLike.isSelected = !binding.imLike.isSelected
-                if(binding.imLike.isSelected){
+            if (binding.imLike.isSelected) {
                 Toast.makeText(
                     this@PreviewAbility,
                     R.string.add_like.getString(),
                     Toast.LENGTH_SHORT
                 ).show()
-                }else{
+            } else {
                 Toast.makeText(
                     this@PreviewAbility,
                     R.string.cancel_like.getString(),
                     Toast.LENGTH_SHORT
                 ).show()
             }
-            }
 
         }
     }
@@ -213,6 +211,7 @@ class PreviewAbility : AppCompatActivity(), EasyPermissions.PermissionCallbacks
             mSetAsDialog = SetAsDialog(this) {
                 onClickHomeScreen = {
 
+                    showTopOn {
                         lifecycleScope.launch {
                             if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N) {
                                 wallpaperManager.setStream(file.inputStream())
@@ -232,13 +231,14 @@ class PreviewAbility : AppCompatActivity(), EasyPermissions.PermissionCallbacks
                                 ).show()
                             }
                         }
+                    }
 
 
                 }
 
                 onClickLockScreen = {
 
-
+                    showTopOn {
                         lifecycleScope.launch {
                             if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N) {
                                 wallpaperManager.setStream(file.inputStream())
@@ -259,11 +259,14 @@ class PreviewAbility : AppCompatActivity(), EasyPermissions.PermissionCallbacks
                             }
                         }
 
+                    }
+
 
                 }
 
                 onClickBoth = {
 
+                    showTopOn {
                         lifecycleScope.launch {
                             wallpaperManager.setStream(file.inputStream())//FLAG_SYSTEM | FLAG_LOCK)
                             onMain {
@@ -275,6 +278,9 @@ class PreviewAbility : AppCompatActivity(), EasyPermissions.PermissionCallbacks
                             }
                         }
                     }
+
+
+                }
             }
         }
         mSetAsDialog?.show()
@@ -302,10 +308,7 @@ class PreviewAbility : AppCompatActivity(), EasyPermissions.PermissionCallbacks
             return
         }
         val filePath = DownloadUtil.getFilePath(mList[mCurPos].getTag())
-        Log.d(
+
-            "-----------",
-            "---------startDownload-${mList[mCurPos].sourceURl}    filePath=${filePath}"
-        )
         binding.flDownload.show()
         DownloadUtil.downloadFile(mList[mCurPos].sourceURl, filePath) {
             runOnUiThread {
@@ -343,10 +346,10 @@ class PreviewAbility : AppCompatActivity(), EasyPermissions.PermissionCallbacks
             )
         val file = File(path)
 
-        val savedUri = MediaUtil.saveToGallery(this@PreviewAbility,file)
+        val savedUri = MediaUtil.saveToGallery(this@PreviewAbility, file)
 //        val saved = MediaUtil.saveImageToSystemAlbum(path,this@PreviewAbility)
         if (!isFinishing) {
-            if (savedUri!= null) {
+            if (savedUri != null) {
                 Toast.makeText(
                     this@PreviewAbility,
                     R.string.saved_to_album,
@@ -367,7 +370,7 @@ class PreviewAbility : AppCompatActivity(), EasyPermissions.PermissionCallbacks
     override fun onPause() {
         super.onPause()
         val selected = binding.imLike.isSelected
-        CoroutineScope(Dispatchers.IO).launch{
+        CoroutineScope(Dispatchers.IO).launch {
             MyDatabase.myDatabase.WallpaperDao().updateWallpaper(listBean?.apply {
                 like = selected
             })

app/src/main/java/com/cute/girl/hd/pink/img/wallpaper/topon/AdManager.kt

@@ -213,6 +213,7 @@ object AdManager {
         showAD(activity) { type ->
             if (type == type_no_cache || type == type_show_close || type == type_show_fail) {
                 listener.onAction()
+                Log.d(MyApp.TAG,"-----------------AD SHOW")
             }
         }
     }

app/src/main/res/values/themes.xml

@@ -10,7 +10,7 @@
         <item name="colorSecondaryVariant">@color/theme_gray</item>
         <item name="colorOnSecondary">@color/black</item>
         <!-- Status bar color. -->
-        <item name="android:statusBarColor">?attr/colorPrimaryVariant</item>
+        <item name="android:statusBarColor">@color/theme_pink</item>
         <!-- Customize your theme here. -->
     </style>
 </resources>