Commit 3cf0cd55 authored by wanglei's avatar wanglei

...fcm验证

parent c226b67c
......@@ -7,6 +7,7 @@ import com.base.scanqr.bean.NotificationSendBean
import com.base.scanqr.bean.NotificationSendBean.Companion.POPUP_WHERE_FCM
import com.base.scanqr.fcm.notification.MyNotificationManager
import com.base.scanqr.helper.EventUtils.event
import com.base.scanqr.utils.LogEx
class FcmReceiver : BroadcastReceiver() {
......@@ -14,6 +15,7 @@ class FcmReceiver : BroadcastReceiver() {
override fun onReceive(context: Context, intent: Intent) {
event("FCM_Received", "FcmReceiver", null)
LogEx.logDebug(TAG, "FCM FcmReceiver")
val sendBean = NotificationSendBean(context, POPUP_WHERE_FCM, canSend = { true }, sendSuccess = {})
MyNotificationManager.submitSendBean(sendBean)
}
......
......@@ -5,16 +5,19 @@ import com.base.scanqr.bean.NotificationSendBean
import com.base.scanqr.bean.NotificationSendBean.Companion.POPUP_WHERE_FCM
import com.base.scanqr.fcm.notification.MyNotificationManager
import com.base.scanqr.helper.EventUtils.event
import com.base.scanqr.utils.LogEx
import com.google.firebase.messaging.FirebaseMessagingService
import com.google.firebase.messaging.RemoteMessage
import org.json.JSONObject
@SuppressLint("MissingFirebaseInstanceTokenRefresh")
class MessagingService : FirebaseMessagingService() {
private val TAG = "MessagingService"
override fun onMessageReceived(remoteMessage: RemoteMessage) {
super.onMessageReceived(remoteMessage)
val data = JSONObject(remoteMessage.data.toString())
event("FCM_Received", "MessagingService", data)
LogEx.logDebug(TAG, "FCM MessagingService")
val sendBean = NotificationSendBean(this, POPUP_WHERE_FCM, canSend = { true }, sendSuccess = {})
MyNotificationManager.submitSendBean(sendBean)
}
......
......@@ -197,13 +197,13 @@ object MyNotificationManager {
* 只测某些类型
*/
private var testWhere = listOf(
POPUP_WHERE_LOCK,
POPUP_WHERE_BATTERY,
POPUP_WHERE_PACKAGE,
POPUP_WHERE_WORK_MANAGER,
POPUP_WHERE_ALARM,
POPUP_WHERE_TIMER,
POPUP_WHERE_FILE_JOB,
// POPUP_WHERE_LOCK,
// POPUP_WHERE_BATTERY,
// POPUP_WHERE_PACKAGE,
// POPUP_WHERE_WORK_MANAGER,
// POPUP_WHERE_ALARM,
// POPUP_WHERE_TIMER,
// POPUP_WHERE_FILE_JOB,
POPUP_WHERE_FCM
)
}
\ No newline at end of file
......@@ -4,9 +4,11 @@ import android.app.Activity
import android.app.AlertDialog
import android.view.Gravity
import android.view.LayoutInflater
import com.base.scanqr.BuildConfig
import com.base.scanqr.R
import com.base.scanqr.ads.AdsMgr
import com.base.scanqr.databinding.DialogAppExitBinding
import kotlin.system.exitProcess
object AppExitDialog {
......@@ -31,7 +33,7 @@ object AppExitDialog {
AdsMgr.showNative(binding.flAd, R.layout.layout_admob_app_exit)
binding.tvYes.setOnClickListener {
dialog.dismiss()
finish()
if (BuildConfig.DEBUG) exitProcess(0) else finish()
}
binding.tvNo.setOnClickListener {
dialog.dismiss()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment