[迭代]通知限制条件

app/src/main/java/com/rgt/superr/business/push/notification/MyNotificationManager.kt

@@ -70,6 +70,17 @@ object MyNotificationManager {
         }
         try {
             sendBeanBlockingQueue.put(bean)
+
+            LogEx.logDebug(TAG, "sendNotificationCan where=${bean.where} actionId=${bean.actionId}")
+            //上报通知
+            EventUtils.event("Notification_Popup_${bean.where}", "actionId=${bean.actionId}")
+            //当天次数加一
+            dayPopupCount += 1
+            //推送时间
+            lastPopupTime = System.currentTimeMillis()
+
+            //这条推送回调
+            bean.sendSuccess?.invoke()
         } catch (e: Exception) {
             EventUtils.event("Notification_Error", "submitSendBean Exception")
             LogEx.logDebug("canSendNotification", "submitSendBean Exception")
@@ -103,17 +114,6 @@ object MyNotificationManager {
                         NotificationUiUtil.setNotification(bean)
                     }.await()
 
-                    LogEx.logDebug(TAG, "sendNotificationCan where=${bean.where} actionId=${bean.actionId}")
-                    //上报通知
-                    EventUtils.event("Notification_Popup_${bean.where}", "actionId=${bean.actionId}")
-                    //当天次数加一
-                    dayPopupCount += 1
-                    //推送时间
-                    lastPopupTime = System.currentTimeMillis()
-
-                    //这条推送回调
-                    bean.sendSuccess?.invoke()
-
                     async(Dispatchers.Main) {
                         //发送悬停
                         NotificationHoverUtils.sendHoverNotification(bean)

app/src/main/java/com/rgt/superr/ui/splash/SplashActivity.kt

@@ -325,6 +325,7 @@ class SplashActivity : BaseActivity<ActivitySplashBinding>(ActivitySplashBinding
         super.onNewIntent(intent)
         actionId = intent?.extras?.getString("actionId") ?: ""
         isHotLaunch = intent?.extras?.getBoolean("isHotLaunch") == true
+        LogEx.logDebug(TAG, "actionId=$actionId")
     }
 
 }
\ No newline at end of file