...

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

@@ -9,7 +9,7 @@ class NotificationSendBean(
     val where: String = "",
     val canSend: () -> Boolean = { true },//是否可以发送
     var sendSuccess: (() -> Unit)? = null,//发送成功回调
-    var valueMap: HashMap<String, Any> = hashMapOf()//发送通知可能携带的参数
+    var valueMap: HashMap<String, Any?> = hashMapOf()//发送通知可能携带的参数
 ) {
 
     var actionId: String = ""

app/src/main/java/com/base/scanqrclear/fcm/FcmReceiver.kt

@@ -21,7 +21,7 @@ class FcmReceiver : BroadcastReceiver() {
         LogEx.logDebug(TAG, "FCM FcmReceiver")
         val sendBean = NotificationSendBean(context, POPUP_WHERE_FCM, canSend = { true }, sendSuccess = {})
         if (isWithinTimeRange()) {
-            val map = hashMapOf<String, Any>()
+            val map = hashMapOf<String, Any?>()
             map["AM"] = "Scan today's product information."
             sendBean.valueMap = map
             sendBean.actionId = ACTION_ID_SCAN

app/src/main/java/com/base/scanqrclear/fcm/MessagingService.kt

@@ -24,7 +24,7 @@ class MessagingService : FirebaseMessagingService() {
         val sendBean = NotificationSendBean(this, POPUP_WHERE_FCM, canSend = { true }, sendSuccess = {})
 
         if (isWithinTimeRange()) {
-            val map = hashMapOf<String, Any>()
+            val map = hashMapOf<String, Any?>()
             map["AM"] = "Scan today's product information."
             sendBean.valueMap = map
             sendBean.actionId = ACTION_ID_SCAN

app/src/main/java/com/base/scanqrclear/fcm/notification/MyNotificationManager.kt

@@ -147,7 +147,7 @@ object MyNotificationManager {
                 //提前获取数据
                 if (bean.actionId == ACTION_ID_EARTHQUAKE) {
                     val data = fetchEarthquakeData()?.features?.maxBy { it.properties.sig }
-                    bean.valueMap["data"] = data as Any
+                    bean.valueMap["data"] = data as Any?
                 }
 
                 async(Dispatchers.Main) {

app/src/main/java/com/base/scanqrclear/ui/scan/ScanOtherActivity.kt

 package com.base.scanqrclear.ui.scan
 
 import androidx.activity.addCallback
+import androidx.activity.result.ActivityResultLauncher
 import androidx.activity.result.IntentSenderRequest
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.core.view.updatePadding
+import com.base.scanqrclear.BuildConfig
 import com.base.scanqrclear.R
 import com.base.scanqrclear.ads.AdsMgr
 import com.base.scanqrclear.base.BaseActivity
@@ -27,10 +29,14 @@ import com.gyf.immersionbar.ktx.immersionBar
 
 class ScanOtherActivity : BaseActivity<ActivityScanOtherBinding>(ActivityScanOtherBinding::inflate) {
 
+    private var scannerLauncher: ActivityResultLauncher<IntentSenderRequest>? = null
+
     override fun initView() {
         super.initView()
         binding.clTop.updatePadding(top = BarUtils.getStatusBarHeight())
 
+        initScannerLauncher()
+
         AdsMgr.showNative(binding.flAd, R.layout.layout_admob_app_exit)
 
 
@@ -56,27 +62,36 @@ class ScanOtherActivity : BaseActivity<ActivityScanOtherBinding>(ActivityScanOth
                         .setScannerMode(SCANNER_MODE_FULL)
                         .build()
                     val scanner = GmsDocumentScanning.getClient(options)
-                    val scannerLauncher = registerForActivityResult(ActivityResultContracts.StartIntentSenderForResult()) { result ->
+
+                    scanner.getStartScanIntent(this)
+                        .addOnSuccessListener { intentSender ->
+                            scannerLauncher?.launch(IntentSenderRequest.Builder(intentSender).build())
+                        }
+                        .addOnFailureListener {
+                            toast("Don't support GmsDocumentScanner", true)
+                        }
+                }
+            }
+        }
+    }
+
+    private fun initScannerLauncher() {
+        scannerLauncher = registerForActivityResult(ActivityResultContracts.StartIntentSenderForResult()) { result ->
             if (result.resultCode == RESULT_OK) {
                 val data = GmsDocumentScanningResult.fromActivityResultIntent(result.data)
                 data?.pages?.forEach { page ->
                     val imageUri = page.imageUri
                     LogEx.logDebug(TAG, "imageUri=$imageUri")
+                    if (BuildConfig.DEBUG) {
+                        binding.tvTest.append("imageUri=$imageUri\n")
+                    }
                 }
                 val pdfUri = data?.pdf?.uri
                 val pdfPageCount = data?.pdf?.pageCount
                 LogEx.logDebug(TAG, "pdfUri=$pdfUri")
+                binding.tvTest.append("pdfUri=$pdfUri\n")
                 LogEx.logDebug(TAG, "pdfPageCount=$pdfPageCount")
-                        }
-                    }
-                    scanner.getStartScanIntent(this)
-                        .addOnSuccessListener { intentSender ->
-                            scannerLauncher.launch(IntentSenderRequest.Builder(intentSender).build())
-                        }
-                        .addOnFailureListener {
-                            toast("Don't support GmsDocumentScanner", true)
-                        }
-                }
+                binding.tvTest.append("pdfPageCount=$pdfPageCount")
             }
         }
     }

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

@@ -87,5 +87,13 @@
 
     </com.base.scanqrclear.ads.NativeParentView>
 
+    <TextView
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        android:id="@+id/tvTest"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"/>
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file