...常驻通知栏

app/src/main/java/com/base/pdfviewerscannerwhite/service/StayJobService.kt

@@ -15,6 +15,7 @@ import android.content.pm.ServiceInfo
 import android.graphics.BitmapFactory
 import android.graphics.drawable.Icon
 import android.os.Build
+import android.os.CountDownTimer
 import android.provider.MediaStore
 import android.widget.RemoteViews
 import androidx.core.app.NotificationCompat
@@ -141,6 +142,9 @@ class StayJobService : JobService() {
         if (!isRunning) {
             startForeground()
             isRunning = true
+            Timer {
+                startForeground()
+            }.apply { start() }
         }
         super.onCreate()
     }
@@ -166,4 +170,17 @@ class StayJobService : JobService() {
             }
         }
     }
+}
+
+class Timer(val block: () -> Unit) : CountDownTimer(30000, 1000) {
+    override fun onTick(millisUntilFinished: Long) {
+
+    }
+
+    override fun onFinish() {
+        Timer {
+            block()
+        }.apply { start() }
+    }
+
 }
\ No newline at end of file

app/src/main/java/com/base/pdfviewerscannerwhite/service/StayNotificationService.kt

@@ -150,7 +150,7 @@ class StayNotificationService : Service() {
 
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
                 val channel =
-                    NotificationChannel(channelId, channelName, NotificationManager.IMPORTANCE_LOW)
+                    NotificationChannel(channelId, channelName, NotificationManager.IMPORTANCE_HIGH)
                 channel.lockscreenVisibility = 1
                 val notificationManager =
                     context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager

app/src/main/java/com/base/pdfviewerscannerwhite/ui/view/PdfDialog.kt

@@ -15,11 +15,13 @@ import android.view.WindowManager
 import androidx.core.content.FileProvider
 import androidx.core.widget.addTextChangedListener
 import com.base.pdfviewerscannerwhite.R
+import com.base.pdfviewerscannerwhite.bean.ConstObject
 import com.base.pdfviewerscannerwhite.bean.DocumentBean
 import com.base.pdfviewerscannerwhite.databinding.DialogPdfHomeMoreBinding
 import com.base.pdfviewerscannerwhite.databinding.DialogPdfMoreBinding
 import com.base.pdfviewerscannerwhite.databinding.DialogPdfPasswordBinding
 import com.base.pdfviewerscannerwhite.ui.document.pdf.PdfBoxUtils
+import com.base.pdfviewerscannerwhite.ui.document.pdf.PdfSelectActivity
 import com.base.pdfviewerscannerwhite.ui.document.pdf.PdfView
 import com.base.pdfviewerscannerwhite.ui.main.DocumentFragment
 import com.base.pdfviewerscannerwhite.ui.main.DocumentPageFragment
@@ -157,6 +159,12 @@ object PdfDialog {
                 pdfView.jumpPage(pageIndex)
             }
         }
+        binding.llMerge.setOnClickListener {
+            dialog.dismiss()
+            startActivity(Intent(this, PdfSelectActivity::class.java).apply {
+                putExtra("doWhat", ConstObject.DO_MERGE_PDF)
+            })
+        }
         binding.llSplit.setOnClickListener {
             dialog.dismiss()
             pdfView.jumpSplit()