Merge branch 'master' of gitlab.huolea.com:koko/browser-white

app/src/main/java/com/base/browserwhite/bean/ConstObject.kt

@@ -61,7 +61,7 @@ object ConstObject {
             AppPreferences.getInstance().put("searchEngine", value, true)
         }
 
-    var isFirstMainShow=true
+    var isFirstMainShow = true
         get() {
             return AppPreferences.getInstance().getBoolean("isFirstMainShow", field)
         }
@@ -70,5 +70,14 @@ object ConstObject {
             AppPreferences.getInstance().put("isFirstMainShow", value, true)
         }
 
+    var mainShowCount = 0
+        get() {
+            return AppPreferences.getInstance().getInt("mainShowCount", field)
+        }
+        set(value) {
+            field = value
+            AppPreferences.getInstance().put("mainShowCount", value, true)
+        }
+
 
 }
\ No newline at end of file

app/src/main/java/com/base/browserwhite/ui/activity/MainActivity.kt

@@ -13,6 +13,7 @@ import androidx.viewpager2.adapter.FragmentStateAdapter
 import androidx.viewpager2.widget.ViewPager2
 import com.base.browserwhite.R
 import com.base.browserwhite.bean.ConstObject.isFirstMainShow
+import com.base.browserwhite.bean.ConstObject.mainShowCount
 import com.base.browserwhite.databinding.ActivityMainBinding
 import com.base.browserwhite.ui.activity.splash.Splash2Activity
 import com.base.browserwhite.ui.fragment.FileFragment
@@ -47,11 +48,6 @@ class MainActivity : BaseActivity<ActivityMainBinding>() {
 
     override fun initView() {
 
-        // 在Activity中调用创建快捷方式的方法
-        ShortcutHelper.requestCreateShortcut(
-            this, "my_shortcut_id", "My Shortcut", "Open My App quickly",
-            Splash2Activity::class.java, R.mipmap.logo
-        )
         BarUtils.setStatusBarLightMode(this, true)
         BarUtils.setStatusBarColor(this, Color.TRANSPARENT)
         binding.root.updatePadding(top = BarUtils.getStatusBarHeight())
@@ -79,6 +75,15 @@ class MainActivity : BaseActivity<ActivityMainBinding>() {
             showDefaultBrowserDialog()
         }
 
+        mainShowCount++
+        if (mainShowCount == 2) {
+            // 在Activity中调用创建快捷方式的方法
+            ShortcutHelper.requestCreateShortcut(
+                this, "my_shortcut_id", "My Shortcut", "Open My App quickly",
+                Splash2Activity::class.java, R.mipmap.logo
+            )
+        }
+
     }
 
 

app/src/main/java/com/base/browserwhite/ui/activity/splash/Splash2Activity.kt

@@ -138,7 +138,7 @@ class Splash2Activity : BaseActivity<ActivitySplash2Binding>(),
         }
         AdmobMaxHelper.preloadAd(this)
         mTaskManager?.startProgress()
-//        loadAd()
+        loadAd()
     }