...

app/build.gradle.kts

@@ -140,7 +140,7 @@ dependencies {
 
 
     //冲突版本确定版本
-    implementation("com.google.guava:guava:29.0-android")
+    implementation("com.google.guava:guava:32.1.3-android")
 
 
     //work 请使用最新版本

app/src/main/AndroidManifest.xml

@@ -35,13 +35,6 @@
         android:theme="@style/Theme.ScanQR"
         tools:targetApi="31">
 
-        <activity
-            android:name="com.google.android.gms.ads.AdActivity"
-            android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|uiMode|screenSize|smallestScreenSize"
-            android:exported="false"
-            android:multiprocess="true"
-            android:theme="@android:style/Theme.Translucent"
-            tools:ignore="MissingClass" />
 
         <activity
             android:name=".ui.start.StartActivity"

app/src/main/java/com/base/scanqr/MyApplication.kt

@@ -22,7 +22,6 @@ import com.base.scanqr.fcm.receiver.ScreenStatusReceiver
 import com.base.scanqr.helper.EventUtils
 import com.base.scanqr.helper.InstallHelps
 import com.base.scanqr.helper.NewComUtils
-import com.base.scanqr.service.StayJobService.Companion.startJob
 import com.base.scanqr.ui.start.StartActivity
 import com.base.scanqr.utils.ActivityManagerUtils
 import com.base.scanqr.utils.AppPreferences
@@ -55,7 +54,7 @@ class MyApplication : Application() {
             "adActivity",
             "AdActivity",
             "AppLovinFullscreenActivity",
-//        SplashActivity::class.java.simpleName,
+            StartActivity::class.java.simpleName,
             // 返回前台时不跳转启动页的 activity
         )
     }
@@ -182,6 +181,7 @@ class MyApplication : Application() {
                     LogEx.logDebug(TAG, "flag=$flag" + "   activity:" + activity.localClassName)
 
                     if (flag) {
+                        LogEx.logDebug(TAG, "onActivityStarted onActivityStarted=$topActivity")
                         topActivity?.startActivity(
                             Intent(
                                 topActivity, StartActivity::class.java

app/src/main/java/com/base/scanqr/ads/admob/AdOpenMgr.kt

@@ -2,7 +2,6 @@ package com.base.scanqr.ads.admob
 
 import android.app.Activity
 import android.content.Context
-import android.nfc.Tag
 import com.base.scanqr.GlobalConfig
 import com.base.scanqr.ads.AdEvent
 import com.base.scanqr.ads.AdsShowCallBack
@@ -98,8 +97,9 @@ class AdOpenMgr {
 
                     adState.onAdHidden()
 
-
+                    //预加载,“Timeout for show call succeed.”预加载的广告大概率,
                     loadAd(activity.applicationContext, false, AdmobEvent("openAd", "preload"))
+
                 }
 
                 override fun onAdClicked() {
@@ -140,6 +140,7 @@ class AdOpenMgr {
                         (adEvent as AdmobEvent).pullAd(appOpenAd.responseInfo)
                         appOpenAd.onPaidEventListener = AdmobEvent.EventOnPaidEventListener(appOpenAd)
                         LimitUtils.addRequestNum()
+
                     }
 
                     override fun onAdFailedToLoad(loadAdError: LoadAdError) {

app/src/main/java/com/base/scanqr/bean/NotificationSendBean.kt

@@ -32,5 +32,9 @@ class NotificationSendBean(
 
         const val ACTION_ID_STAY_SCAN = "action_id_stay_scan"
         const val ACTION_ID_SCAN = "action_id_scan"
+        const val ACTION_ID_WIFI = "action_id_wifi"
+        const val ACTION_ID_TEXT = "action_id_text"
+        const val ACTION_ID_EMAIL = "action_id_email"
+        const val ACTION_ID_WEBSITE = "action_id_website"
     }
 }
\ No newline at end of file

app/src/main/java/com/base/scanqr/fcm/notification/NotificationManager.kt

@@ -5,7 +5,6 @@ import com.base.scanqr.BuildConfig
 import com.base.scanqr.bean.NotificationSendBean
 import com.base.scanqr.bean.NotificationSendBean.Companion.ACTION_ID_SCAN
 import com.base.scanqr.bean.NotificationSendBean.Companion.POPUP_WHERE_LOCK
-import com.base.scanqr.bean.NotificationSendBean.Companion.POPUP_WHERE_TIMBER
 import com.base.scanqr.bean.config.PopupConfigBean.Companion.popupConfigBean
 import com.base.scanqr.helper.EventUtils
 import com.base.scanqr.utils.AppPreferences

app/src/main/java/com/base/scanqr/ui/start/StartActivity.kt

@@ -31,7 +31,6 @@ class StartActivity : BaseActivity<ActivityStartBinding>(ActivityStartBinding::i
 
     override fun initView() {
         super.initView()
-
         if (ConstObject.ifAgreePrivacy) {
             agreePrivacy()
         }
@@ -161,4 +160,8 @@ class StartActivity : BaseActivity<ActivityStartBinding>(ActivityStartBinding::i
         viewModel.cancelJumpJob()
         cancelProgressJob()
     }
+
+    override fun onStop() {
+        super.onStop()
+    }
 }
\ No newline at end of file

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

+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:gravity="center"
+    android:orientation="vertical"
+    tools:ignore="DisableBaselineAlignment">
+
+    <ImageView
+        android:id="@+id/ivIcon"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="8dp"
+        android:src="@mipmap/h_wifi"
+        tools:ignore="ContentDescription" />
+
+    <TextView
+        android:id="@+id/tv_desc"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="10dp"
+        android:gravity="center"
+        android:textColor="@color/black"
+        android:textSize="16sp"
+        tools:text="Try to create your own QR cord and share it!" />
+
+    <TextView
+        android:id="@+id/tvBtn"
+        android:layout_width="match_parent"
+        android:layout_height="45dp"
+        android:layout_marginHorizontal="15dp"
+        android:layout_marginTop="10dp"
+        android:layout_marginBottom="10dp"
+        android:background="@drawable/bg_8559ea_6672f7"
+        android:gravity="center"
+        android:text="@string/create_now"
+        android:textColor="@color/white"
+        android:textSize="18sp"
+        android:textStyle="bold" />
+
+</LinearLayout>
\ No newline at end of file

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

+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="horizontal"
+    tools:ignore="DisableBaselineAlignment">
+
+    <ImageView
+        android:id="@+id/ivIcon"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_vertical"
+        android:src="@mipmap/h_wifi"
+        tools:ignore="ContentDescription,ImageContrastCheck" />
+
+    <LinearLayout
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_vertical"
+        android:layout_marginHorizontal="8dp"
+        android:layout_weight="1"
+        android:orientation="vertical">
+
+        <TextView
+            android:id="@+id/tvTitle"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:textColor="@color/black"
+            android:textSize="15sp"
+            tools:text="Search for product information" />
+
+        <TextView
+            android:id="@+id/tvDesc"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:textColor="#666666"
+            android:textSize="12sp"
+            tools:text="Find the lowest priced store!" />
+    </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file

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

@@ -75,5 +75,6 @@
     <string name="new_product">New feature! Search for information about the product.</string>
     <string name="what_products">What products are you\nlooking for today?</string>
     <string name="find_now">Find Now</string>
+    <string name="create_now">Create Now</string>
 
 </resources>
\ No newline at end of file