...

app/src/main/java/com/base/appzxhy/bean/NotificationInfoBean.kt → app/src/main/java/com/base/appzxhy/bean/push/NotificationInfoBean.kt

-package com.base.appzxhy.bean
+package com.base.appzxhy.bean.push
 
 import android.graphics.Bitmap
 import kotlinx.serialization.Serializable

app/src/main/java/com/base/appzxhy/bean/NotificationSendBean.kt → app/src/main/java/com/base/appzxhy/bean/push/NotificationSendBean.kt

-package com.base.appzxhy.bean
+package com.base.appzxhy.bean.push
 
 import android.content.Context
 import android.content.Intent

app/src/main/java/com/base/appzxhy/business/push/fcm/FcmReceiver.kt

@@ -3,8 +3,8 @@ package com.base.appzxhy.business.push.fcm
 import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
-import com.base.appzxhy.bean.NotificationSendBean
-import com.base.appzxhy.bean.NotificationSendBean.Companion.POPUP_WHERE_FCM
+import com.base.appzxhy.bean.push.NotificationSendBean
+import com.base.appzxhy.bean.push.NotificationSendBean.Companion.POPUP_WHERE_FCM
 import com.base.appzxhy.push.notification.MyNotificationManager
 import com.base.appzxhy.business.helper.EventUtils.event
 

app/src/main/java/com/base/appzxhy/business/push/fcm/MessagingService.kt

 package com.base.appzxhy.business.push.fcm
 
 import android.annotation.SuppressLint
-import com.base.appzxhy.bean.NotificationSendBean
-import com.base.appzxhy.bean.NotificationSendBean.Companion.POPUP_WHERE_FCM
+import com.base.appzxhy.bean.push.NotificationSendBean
+import com.base.appzxhy.bean.push.NotificationSendBean.Companion.POPUP_WHERE_FCM
 import com.base.appzxhy.push.notification.MyNotificationManager
 import com.base.appzxhy.business.helper.EventUtils.event
 import com.google.firebase.messaging.FirebaseMessagingService

app/src/main/java/com/base/appzxhy/business/push/notification/MyNotificationManager.kt

@@ -3,11 +3,10 @@ package com.base.appzxhy.push.notification
 import android.content.Context
 import com.base.appzxhy.BuildConfig
 import com.base.appzxhy.MyApplication
-import com.base.appzxhy.bean.NotificationSendBean
-import com.base.appzxhy.bean.NotificationSendBean.Companion.ACTION_ID_TEST
-import com.base.appzxhy.bean.NotificationSendBean.Companion.POPUP_WHERE_WORK_MANAGER
+import com.base.appzxhy.bean.push.NotificationSendBean
+import com.base.appzxhy.bean.push.NotificationSendBean.Companion.ACTION_ID_TEST
+import com.base.appzxhy.bean.push.NotificationSendBean.Companion.POPUP_WHERE_WORK_MANAGER
 import com.base.appzxhy.bean.config.PopupConfigBean.Companion.popupConfigBean
-import com.base.appzxhy.push.notification.NotificationBeanUtils.nextNotificationInfoBean
 import com.base.appzxhy.business.helper.EventUtils
 import com.base.appzxhy.utils.AppPreferences
 import com.base.appzxhy.utils.KotlinExt.currentDate

app/src/main/java/com/base/appzxhy/business/push/notification/NotificationBeanUtils.kt

@@ -9,7 +9,7 @@ import android.graphics.Path
 import android.graphics.RectF
 import android.graphics.Shader
 import androidx.core.graphics.createBitmap
-import com.base.appzxhy.bean.NotificationInfoBean
+import com.base.appzxhy.bean.push.NotificationInfoBean
 import com.google.gson.Gson
 import com.google.gson.reflect.TypeToken
 import com.mbridge.msdk.thrid.okhttp.OkHttpClient
@@ -20,7 +20,7 @@ import java.io.InputStream
 import java.util.LinkedList
 
 /**
- * 处理推送要到bean类
+ * 处理推送用到bean类
  */
 object NotificationBeanUtils {
 
@@ -31,7 +31,7 @@ object NotificationBeanUtils {
         try {
             val gson = Gson()
             val type = object : TypeToken<List<NotificationInfoBean>>() {}.type
-            val list = gson.fromJson<List<NotificationInfoBean>>("", type)
+            val list = gson.fromJson<List<NotificationInfoBean>>("push_json_key", type)
             notificationQueue.addAll(list)
         } catch (e: Exception) {
         }

app/src/main/java/com/base/appzxhy/business/push/notification/NotificationHoverUtils.kt

@@ -3,9 +3,8 @@ package com.base.appzxhy.push.notification
 import android.os.Handler
 import android.os.HandlerThread
 import com.base.appzxhy.MyApplication
-import com.base.appzxhy.bean.NotificationSendBean
+import com.base.appzxhy.bean.push.NotificationSendBean
 import com.base.appzxhy.bean.config.PopupConfigBean.Companion.popupConfigBean
-import com.base.appzxhy.utils.LogEx
 
 /**
  * 通知悬停

app/src/main/java/com/base/appzxhy/business/push/notification/NotificationUiUtil.kt

@@ -4,16 +4,14 @@ import android.app.NotificationChannel
 import android.app.NotificationManager
 import android.app.PendingIntent
 import android.content.Context
-import android.content.Intent
 import android.graphics.drawable.Icon
 import android.os.Build
 import android.widget.RemoteViews
 import androidx.core.app.NotificationCompat
 import androidx.core.graphics.drawable.IconCompat
 import com.base.appzxhy.R
-import com.base.appzxhy.bean.NotificationInfoBean
-import com.base.appzxhy.bean.NotificationSendBean
-import com.base.appzxhy.bean.NotificationSendBean.Companion.ACTION_ID_TEST
+import com.base.appzxhy.bean.push.NotificationSendBean
+import com.base.appzxhy.bean.push.NotificationSendBean.Companion.ACTION_ID_TEST
 import com.base.appzxhy.bean.config.PopupConfigBean
 import kotlin.random.Random
 

app/src/main/java/com/base/appzxhy/business/push/receiver/AlarmReceiver.kt

@@ -8,7 +8,7 @@ import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
 import com.base.appzxhy.BuildConfig
-import com.base.appzxhy.bean.NotificationSendBean
+import com.base.appzxhy.bean.push.NotificationSendBean
 import com.base.appzxhy.bean.config.PopupConfigBean
 import com.base.appzxhy.business.helper.EventUtils
 import com.base.appzxhy.push.notification.MyNotificationManager

app/src/main/java/com/base/appzxhy/business/push/receiver/ScreenStatusReceiver.kt

@@ -5,8 +5,8 @@ import android.content.Context
 import android.content.Intent
 import android.content.IntentFilter
 import android.os.Build
-import com.base.appzxhy.bean.NotificationSendBean
-import com.base.appzxhy.bean.NotificationSendBean.Companion.POPUP_WHERE_LOCK
+import com.base.appzxhy.bean.push.NotificationSendBean
+import com.base.appzxhy.bean.push.NotificationSendBean.Companion.POPUP_WHERE_LOCK
 import com.base.appzxhy.bean.config.PopupConfigBean.Companion.popupConfigBean
 import com.base.appzxhy.push.notification.MyNotificationManager
 import java.util.Objects

app/src/main/java/com/base/appzxhy/business/push/timer/TimerManager.kt

@@ -2,8 +2,8 @@ package com.base.appzxhy.push.timer
 
 import android.util.Log
 import com.base.appzxhy.MyApplication
-import com.base.appzxhy.bean.NotificationSendBean
-import com.base.appzxhy.bean.NotificationSendBean.Companion.POPUP_WHERE_TIMER
+import com.base.appzxhy.bean.push.NotificationSendBean
+import com.base.appzxhy.bean.push.NotificationSendBean.Companion.POPUP_WHERE_TIMER
 import com.base.appzxhy.bean.config.PopupConfigBean.Companion.popupConfigBean
 import com.base.appzxhy.push.notification.MyNotificationManager
 import com.base.appzxhy.push.receiver.ScreenStatusReceiver

app/src/main/java/com/base/appzxhy/business/push/work/RepeatingWorker.kt

@@ -8,8 +8,8 @@ import androidx.work.PeriodicWorkRequestBuilder
 import androidx.work.WorkManager
 import androidx.work.Worker
 import androidx.work.WorkerParameters
-import com.base.appzxhy.bean.NotificationSendBean
-import com.base.appzxhy.bean.NotificationSendBean.Companion.POPUP_WHERE_WORK_MANAGER
+import com.base.appzxhy.bean.push.NotificationSendBean
+import com.base.appzxhy.bean.push.NotificationSendBean.Companion.POPUP_WHERE_WORK_MANAGER
 import com.base.appzxhy.bean.config.PopupConfigBean
 import com.base.appzxhy.push.notification.MyNotificationManager
 import com.base.appzxhy.business.helper.EventUtils

app/src/main/java/com/base/appzxhy/business/service/StayJobService.kt

@@ -31,7 +31,7 @@ class StayJobService : JobService() {
 
     companion object {
         private val TAG = "StayJobService"
-        val NOTIFICATION_STAY_ID = 186
+        private val NOTIFICATION_STAY_ID = 186
 
 
         private var isRunning = false
@@ -83,10 +83,7 @@ class StayJobService : JobService() {
         val notificationManager =
             getSystemService(NOTIFICATION_SERVICE) as NotificationManager
 
-        notificationManager.notify(
-            NOTIFICATION_STAY_ID,
-            createPermanentNotification(applicationContext)
-        )
+        notificationManager.notify(NOTIFICATION_STAY_ID, createPermanentNotification(applicationContext))
     }
 
     override fun onDestroy() {