优化代码

Author: geyifeng

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

@@ -43,22 +43,22 @@ class Cactus private constructor() {
          * 运行时回调广播ACTION
          */
         @JvmField
-        val CACTUS_WORK = "work".fieldByPid
+        val CACTUS_WORK = "work".fieldById
         /**
          * 停止时回调广播ACTION
          */
         @JvmField
-        val CACTUS_STOP = "stop".fieldByPid
+        val CACTUS_STOP = "stop".fieldById
         /**
          * 后台回调广播ACTION
          */
         @JvmField
-        val CACTUS_BACKGROUND = "background".fieldByPid
+        val CACTUS_BACKGROUND = "background".fieldById
         /**
          * 前台后调广播ACTION
          */
         @JvmField
-        val CACTUS_FOREGROUND = "foreground".fieldByPid
+        val CACTUS_FOREGROUND = "foreground".fieldById
         /**
          * key，通过广播形式获取启动次数
          */

cactus/src/main/java/com/gyf/cactus/ext/CactusExt.kt

@@ -377,9 +377,14 @@ internal val Context.isCactusRunning
     }
 
 /**
- * 获得带pid值的字段值
+ * 获得带id值的字段值
  */
-internal val String.fieldByPid get() = "${Constant.CACTUS_PACKAGE}.${this}.${Process.myPid()}"
+internal val String.fieldById get() = "${Constant.CACTUS_PACKAGE}.${this}.$id"
+
+/**
+ * 获取id
+ */
+internal val id get() = if (Process.myUid() <= 0) Process.myPid() else Process.myUid()
 
 /**
  * 解除DeathRecipient绑定

cactus/src/main/java/com/gyf/cactus/service/CactusJobService.kt

@@ -9,7 +9,6 @@ import android.content.ComponentName
 import android.content.Context
 import android.content.Intent
 import android.os.Build
-import android.os.Process
 import androidx.annotation.RequiresApi
 import com.gyf.cactus.entity.CactusConfig
 import com.gyf.cactus.entity.Constant
@@ -84,7 +83,7 @@ class CactusJobService : JobService() {
         if (mJobId != -1) {
             mJobScheduler.cancel(mJobId)
         }
-        mJobId = Process.myPid()
+        mJobId = id
         saveJobId(mJobId)
         val builder = JobInfo.Builder(
             mJobId,