...

app/src/main/AndroidManifest.xml

@@ -48,31 +48,48 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-
         <activity
-            android:name=".ui.activity.weather.WeatherInterface"
+            android:name=".ui.activity.MainActivity"
             android:exported="false"
             android:launchMode="singleTop"
             android:screenOrientation="portrait"
             tools:ignore="DiscouragedApi,LockedOrientationActivity" />
         <activity
-            android:name=".ui.activity.appprocess.AppProcessActivity"
+            android:name=".ui.activity.webbrowser.WebBrowserActivity"
+            android:exported="true"
+            android:launchMode="singleTop"
+            android:screenOrientation="portrait"
+            tools:ignore="DiscouragedApi,LockedOrientationActivity">
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <!-- 接受网页链接 -->
+                <data android:scheme="http" />
+                <data android:scheme="https" />
+            </intent-filter>
+        </activity>
+        <activity
+            android:name=".ui.activity.weather.WeatherInterface"
             android:exported="false"
             android:launchMode="singleTop"
             android:screenOrientation="portrait"
             tools:ignore="DiscouragedApi,LockedOrientationActivity" />
         <activity
-            android:name=".ui.activity.scanqrc.QrcResultActivity"
+            android:name=".ui.activity.appprocess.AppProcessActivity"
             android:exported="false"
             android:launchMode="singleTop"
             android:screenOrientation="portrait"
             tools:ignore="DiscouragedApi,LockedOrientationActivity" />
         <activity
-            android:name=".ui.activity.MainActivity"
+            android:name=".ui.activity.scanqrc.QrcResultActivity"
             android:exported="false"
             android:launchMode="singleTop"
             android:screenOrientation="portrait"
             tools:ignore="DiscouragedApi,LockedOrientationActivity" />
+
         <activity
             android:name=".ui.activity.download.WebDownloadManagerActivity"
             android:exported="false"
@@ -128,7 +145,7 @@
             android:screenOrientation="portrait"
             tools:ignore="DiscouragedApi,LockedOrientationActivity" />
         <activity
-            android:name=".ui.activity.webstore.WevStoreActivity"
+            android:name=".ui.activity.webstore.WebStoreActivity"
             android:exported="false"
             android:launchMode="singleTop"
             android:screenOrientation="portrait"
@@ -145,12 +162,7 @@
             android:launchMode="singleTop"
             android:screenOrientation="portrait"
             tools:ignore="DiscouragedApi,LockedOrientationActivity" />
-        <activity
-            android:name=".ui.activity.webbrowser.WebBrowserActivity"
-            android:exported="false"
-            android:launchMode="singleTop"
-            android:screenOrientation="portrait"
-            tools:ignore="DiscouragedApi,LockedOrientationActivity" />
+
         <activity
             android:name=".ui.activity.labelstack.LabelStackActivity"
             android:exported="false"

app/src/main/java/com/base/browserwhite/ads/AdmobMaxHelper.kt

@@ -25,6 +25,12 @@ object AdmobMaxHelper {
     var isBlack: Boolean = false
     var isInterOpenShowing: Boolean = false
 
+//    if (System.currentTimeMillis() - lastShowInter > 10 * 1000 * 1000 || lastShowInter == 0L) {
+//        AdmobMaxHelper.admobMaxShowInterstitialAd(this@WebBrowserActivity, false) {
+//            lastShowInter = System.currentTimeMillis()
+//            finishToMain()
+//        }
+//    }
     var lastShowInter = 0L
 
     private fun getSpAdmobTrueMaxFalse(): Boolean {

app/src/main/java/com/base/browserwhite/ui/activity/webstore/WevStoreActivity.kt → app/src/main/java/com/base/browserwhite/ui/activity/webstore/WebStoreActivity.kt

@@ -4,14 +4,17 @@ import android.annotation.SuppressLint
 import android.content.Intent
 import android.graphics.Color
 import android.graphics.drawable.Drawable
+import androidx.activity.addCallback
 import androidx.core.view.updatePadding
 import androidx.lifecycle.lifecycleScope
 import com.base.browserwhite.R
+import com.base.browserwhite.ads.AdmobMaxHelper
+import com.base.browserwhite.ads.AdmobMaxHelper.lastShowInter
 import com.base.browserwhite.bean.WebCategoryBean
 import com.base.browserwhite.bean.WebSiteGroupBean
 import com.base.browserwhite.bean.webCategoryBeanList
 import com.base.browserwhite.bean.webSiteGroupBeanList
-import com.base.browserwhite.databinding.ActivityWevStoreBinding
+import com.base.browserwhite.databinding.ActivityWebStoreBinding
 import com.base.browserwhite.databinding.ItemTabWebstoreBinding
 import com.base.browserwhite.ui.activity.BaseActivity
 import com.base.browserwhite.ui.activity.webbrowser.WebBrowserActivity
@@ -25,12 +28,12 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 
 
-class WevStoreActivity : BaseActivity<ActivityWevStoreBinding>() {
+class WebStoreActivity : BaseActivity<ActivityWebStoreBinding>() {
 
     private val TAG = "WevStoreActivity"
 
-    override val binding: ActivityWevStoreBinding by lazy {
-        ActivityWevStoreBinding.inflate(layoutInflater)
+    override val binding: ActivityWebStoreBinding by lazy {
+        ActivityWebStoreBinding.inflate(layoutInflater)
     }
     private val webCategoryBean: ArrayList<WebCategoryBean> = arrayListOf()
     private val webSiteGroupBean: ArrayList<WebSiteGroupBean> = arrayListOf()
@@ -63,8 +66,16 @@ class WevStoreActivity : BaseActivity<ActivityWevStoreBinding>() {
     override fun initListener() {
         super.initListener()
 
+        onBackPressedDispatcher.addCallback {
+            if (System.currentTimeMillis() - lastShowInter > 10 * 1000 * 1000 || lastShowInter == 0L) {
+                AdmobMaxHelper.admobMaxShowInterstitialAd(this@WebStoreActivity, false) {
+                    lastShowInter = System.currentTimeMillis()
+                    finishToMain()
+                }
+            }
+        }
         binding.ivGuanbi.setOnClickListener {
-            finishToMain()
+            onBackPressedDispatcher.onBackPressed()
         }
     }
 
@@ -72,14 +83,14 @@ class WevStoreActivity : BaseActivity<ActivityWevStoreBinding>() {
         webCategoryBean.addAll(webCategoryBeanList)
         webSiteGroupBean.addAll(webSiteGroupBeanList)
 
-        val imageSize = this@WevStoreActivity.resources.getDimensionPixelSize(R.dimen.dp_30)
+        val imageSize = this@WebStoreActivity.resources.getDimensionPixelSize(R.dimen.dp_30)
         launch(Dispatchers.Main) {
             webCategoryBean.forEach { bean ->
 //                LogEx.logDebug(TAG, bean.iconUrl)
                 val tabBinding = ItemTabWebstoreBinding.inflate(layoutInflater)
                 tabBinding.tv.text = bean.name
 
-                Glide.with(this@WevStoreActivity).asDrawable().load(bean.iconUrl).into(
+                Glide.with(this@WebStoreActivity).asDrawable().load(bean.iconUrl).into(
                     object : CustomTarget<Drawable>() {
                         override fun onResourceReady(resource: Drawable, transition: Transition<in Drawable>?) {
                             LogEx.logDebug(TAG, "resource=${resource.intrinsicWidth} ${resource.intrinsicHeight}")

app/src/main/java/com/base/browserwhite/ui/adapter/HeadWebsiteAdapter.kt

@@ -12,7 +12,7 @@ import com.base.browserwhite.R
 import com.base.browserwhite.bean.WebSiteBean
 import com.base.browserwhite.databinding.ItemWebsiteHeadBinding
 import com.base.browserwhite.ui.activity.webbrowser.WebBrowserActivity
-import com.base.browserwhite.ui.activity.webstore.WevStoreActivity
+import com.base.browserwhite.ui.activity.webstore.WebStoreActivity
 import com.base.browserwhite.ui.views.itemtouch.MyItemTouchHelperCallBack
 import com.base.browserwhite.utils.XmlEx.inflate
 import com.chad.library.adapter4.BaseSingleItemAdapter
@@ -33,7 +33,7 @@ class HeadWebsiteAdapter : BaseSingleItemAdapter<List<WebSiteBean>, HeadWebsiteA
 
         val websiteAdapter = WebsiteAdapter(0) { bean ->
             if (bean.name == "Increase") {
-                context.startActivity(Intent(context, WevStoreActivity::class.java))
+                context.startActivity(Intent(context, WebStoreActivity::class.java))
             } else {
                 context.startActivity(Intent(context, WebBrowserActivity::class.java).apply {
                     putExtra("url", bean.url)

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

@@ -6,7 +6,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    tools:context=".ui.activity.webstore.WevStoreActivity">
+    tools:context=".ui.activity.webstore.WebStoreActivity">
 
     <FrameLayout
         android:layout_width="match_parent"

app/src/main/res/layout/activity_wev_store.xml → app/src/main/res/layout/activity_web_store.xml

@@ -6,7 +6,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    tools:context=".ui.activity.webstore.WevStoreActivity">
+    tools:context=".ui.activity.webstore.WebStoreActivity">
 
     <FrameLayout
         android:layout_width="match_parent"