...推送跳转

app/src/main/java/com/base/datarecovery/activity/recovery/FileScanResultActivity.kt

@@ -4,6 +4,7 @@ import android.annotation.SuppressLint
 import android.content.Intent
 import android.graphics.Color
 import android.os.Environment
+import android.view.View
 import androidx.activity.addCallback
 import androidx.lifecycle.lifecycleScope
 import com.base.datarecovery.adapter.FileFolderAdapter
@@ -122,6 +123,7 @@ class FileScanResultActivity : BaseActivity<ActivityFileScanResultBinding>() {
         fileFolderAdapter.setData(list)
     }
 
+    @SuppressLint("SetTextI18n")
     private fun beginScan() {
         if (scanOnce)
             return
@@ -178,10 +180,11 @@ class FileScanResultActivity : BaseActivity<ActivityFileScanResultBinding>() {
             },
             onFinish = {
                 lifecycleScope.launch(Dispatchers.Main) {
+                    binding.ivWancheng.visibility = View.VISIBLE
+                    binding.tvScanning.text = "Completed!"
+                    AdmobInterstitialUtils.showInterstitialAd(this@FileScanResultActivity) {}
                     dialogClass.finishScan {
-                        AdmobInterstitialUtils.showInterstitialAd(this@FileScanResultActivity) {
-                            scanDialog.dismiss()
-                        }
+                        scanDialog.dismiss()
                     }
                 }
             }

app/src/main/java/com/base/datarecovery/view/FileScanDialog.kt

@@ -28,7 +28,7 @@ class FileScanDialog(
 
     @SuppressLint("SetTextI18n")
     fun showFileScanDialog(
-        sharedFlow: SharedFlow<String>,
+        pathFlow: SharedFlow<String>,
         foundFlow: SharedFlow<Pair<Int, String>>
     ): AlertDialog {
         dialog?.setView(binding.root)
@@ -59,7 +59,7 @@ class FileScanDialog(
         AdmobNativeUtils.showNativeAd(activity, binding.flAd, R.layout.layout_native_custom_big)
 
         activity.lifecycleScope.launch(Dispatchers.Main) {
-            sharedFlow.collectLatest { path ->
+            pathFlow.collectLatest { path ->
                 binding.tvPath.text = path
             }
         }

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

@@ -48,8 +48,8 @@
         android:layout_height="123dp"
         android:layout_marginHorizontal="16dp"
         android:layout_marginTop="16dp"
-        app:cardCornerRadius="10dp"
         app:cardBackgroundColor="#F0F3FA"
+        app:cardCornerRadius="10dp"
         app:cardElevation="0dp">
 
         <androidx.constraintlayout.widget.ConstraintLayout
@@ -69,18 +69,21 @@
                 tools:ignore="UseCompoundDrawables">
 
                 <ImageView
+                    android:id="@+id/iv_wancheng"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_vertical"
+                    android:layout_marginEnd="8dp"
                     android:src="@mipmap/wancheng"
+                    android:visibility="gone"
                     tools:ignore="ContentDescription" />
 
                 <TextView
+                    android:id="@+id/tv_scanning"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_vertical"
-                    android:layout_marginStart="8dp"
-                    android:text="Finished!"
+                    android:text="Scanning"
                     android:textColor="@color/black"
                     android:textSize="16sp"
                     android:textStyle="bold"
@@ -112,10 +115,11 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_horizontal"
+                    android:text="0"
                     android:textColor="@color/black"
                     android:textSize="23sp"
                     android:textStyle="bold"
-                    tools:text="1786" />
+                    tools:ignore="HardcodedText" />
 
                 <TextView
                     android:id="@+id/tv_file_type"
@@ -144,10 +148,11 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_horizontal"
+                    android:text="0"
                     android:textColor="@color/black"
                     android:textSize="23sp"
                     android:textStyle="bold"
-                    tools:text="16" />
+                    tools:ignore="HardcodedText" />
 
                 <TextView
                     android:layout_width="wrap_content"
@@ -171,9 +176,9 @@
         android:id="@+id/rv"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
         android:layout_marginTop="16dp"
         android:orientation="vertical"
+        app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
         tools:listitem="@layout/item_folder_recovery" />
 
 </LinearLayout>
\ No newline at end of file

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

@@ -28,6 +28,7 @@
             android:layout_marginHorizontal="8dp"
             android:layout_weight="1"
             android:gravity="center"
+            android:maxLines="2"
             android:textColor="#000000"
             android:textSize="12sp"
             android:textStyle="bold" />
@@ -40,11 +41,11 @@
             android:layout_gravity="center_vertical"
             android:layout_marginEnd="12dp"
             android:background="@drawable/bg_567dfd_15"
-            android:paddingHorizontal="25dp"
+            android:paddingHorizontal="20dp"
             android:paddingVertical="8dp"
             android:text="View"
             android:textColor="@color/white"
-            android:textSize="15sp"
+            android:textSize="12sp"
             tools:ignore="HardcodedText" />
 
     </LinearLayout>