优化代码

Author: geyifeng

cactus/src/main/java/com/gyf/cactus/Cactus.kt

@@ -6,18 +6,14 @@ import android.app.PendingIntent
 import android.content.Context
 import android.graphics.Bitmap
 import android.os.Build
-import android.os.Process
 import android.widget.RemoteViews
 import com.gyf.cactus.callback.CactusBackgroundCallback
 import com.gyf.cactus.callback.CactusCallback
 import com.gyf.cactus.entity.CactusConfig
 import com.gyf.cactus.entity.Constant
 import com.gyf.cactus.entity.DefaultConfig
 import com.gyf.cactus.entity.NotificationConfig
-import com.gyf.cactus.ext.isServiceRunning
-import com.gyf.cactus.ext.register
-import com.gyf.cactus.ext.restart
-import com.gyf.cactus.ext.unregister
+import com.gyf.cactus.ext.*
 
 /**
  * Cactus保活方案，Cactus有两种形式处理回调事件，
@@ -47,30 +43,28 @@ class Cactus private constructor() {
          * 运行时回调广播ACTION
          */
         @JvmField
-        val CACTUS_WORK = "work".field
+        val CACTUS_WORK = "work".fieldByPid
         /**
          * 停止时回调广播ACTION
          */
         @JvmField
-        val CACTUS_STOP = "stop".field
+        val CACTUS_STOP = "stop".fieldByPid
         /**
          * 后台回调广播ACTION
          */
         @JvmField
-        val CACTUS_BACKGROUND = "background".field
+        val CACTUS_BACKGROUND = "background".fieldByPid
         /**
          * 前台后调广播ACTION
          */
         @JvmField
-        val CACTUS_FOREGROUND = "foreground".field
+        val CACTUS_FOREGROUND = "foreground".fieldByPid
         /**
          * key，通过广播形式获取启动次数
          */
         const val CACTUS_TIMES = "times"
         @JvmStatic
         val instance by lazy { Cactus() }
-
-        private val String.field get() = "${Constant.CACTUS_PACKAGE}.${this}.${Process.myPid()}"
     }
 
     /**
@@ -375,5 +369,5 @@ class Cactus private constructor() {
     /**
      * 是否在运行
      */
-    fun isRunning(context: Context) = context.isServiceRunning
+    fun isRunning(context: Context) = context.isCactusRunning
 }

cactus/src/main/java/com/gyf/cactus/callback/AppBackgroundCallback.kt

@@ -38,6 +38,10 @@ class AppBackgroundCallback @JvmOverloads constructor(
      * 是否是第一次发送前后台广播
      */
     private var mIsFirst = true
+    /**
+     * 是否使用监听回调
+     */
+    private var mUseCallback = true
 
     companion object {
         private const val FIRST_TIME = 1000L
@@ -83,23 +87,29 @@ class AppBackgroundCallback @JvmOverloads constructor(
     override fun onActivitySaveInstanceState(activity: Activity, outState: Bundle) {
     }
 
+    internal fun useCallback(useCallback: Boolean) {
+        mUseCallback = useCallback
+    }
+
     /**
      * 处理广播
      */
     private fun post() {
         (mContext?.get() ?: context)?.apply {
-            if (mFrontActivityCount == 0) {
-                mIsSend = false
-                sMainHandler.postDelayed {
-                    sendBroadcast(Intent().setAction(Cactus.CACTUS_BACKGROUND))
-                    block?.let { it(true) }
-                }
-            } else {
-                if (!mIsSend) {
-                    mIsSend = true
+            if (mUseCallback) {
+                if (mFrontActivityCount == 0) {
+                    mIsSend = false
                     sMainHandler.postDelayed {
-                        sendBroadcast(Intent().setAction(Cactus.CACTUS_FOREGROUND))
-                        block?.let { it(false) }
+                        sendBroadcast(Intent().setAction(Cactus.CACTUS_BACKGROUND))
+                        block?.let { it(true) }
+                    }
+                } else {
+                    if (!mIsSend) {
+                        mIsSend = true
+                        sMainHandler.postDelayed {
+                            sendBroadcast(Intent().setAction(Cactus.CACTUS_FOREGROUND))
+                            block?.let { it(false) }
+                        }
                     }
                 }
             }

cactus/src/main/java/com/gyf/cactus/entity/Constant.kt

@@ -32,6 +32,14 @@ internal object Constant {
      * 服务ID key
      */
     internal const val CACTUS_SERVICE_ID = "serviceId"
+    /**
+     * JobID key
+     */
+    internal const val CACTUS_JOB_ID = "jobId"
+    /**
+     * 进程名字
+     */
+    internal const val CACTUS_EMOTE_SERVICE = "cactusRemoteService"
     /**
      * 回调集合
      */