优化代码

Author: geyifeng

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

@@ -65,7 +65,6 @@ class Cactus private constructor() {
          * key，通过广播形式获取启动次数
          */
         const val CACTUS_TIMES = "times"
-
         @JvmStatic
         val instance by lazy { Cactus() }
     }

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

@@ -18,4 +18,4 @@ interface CactusCallback {
      * 停止时调用
      */
     fun onStop()
-}
+}

cactus/src/main/java/com/gyf/cactus/exception/CactusException.kt

@@ -6,4 +6,4 @@ package com.gyf.cactus.exception
  * @author geyifeng
  * @date 2019-11-08 11:51
  */
-class CactusException internal constructor(msg: String) : Exception(msg)
+class CactusException internal constructor(msg: String) : Exception(msg)

cactus/src/main/java/com/gyf/cactus/pix/OnePixActivity.kt

@@ -2,11 +2,10 @@ package com.gyf.cactus.pix
 
 import android.app.Activity
 import android.os.Bundle
-import android.util.Log
 import android.view.Gravity
-import com.gyf.cactus.entity.Constant
 import com.gyf.cactus.ext.finishOnePix
 import com.gyf.cactus.ext.isScreenOn
+import com.gyf.cactus.ext.log
 import com.gyf.cactus.ext.setOnePix
 
 /**
@@ -18,7 +17,7 @@ class OnePixActivity : Activity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        Log.d(Constant.CACTUS_TAG, "one pix is created")
+        log("one pix is created")
         overridePendingTransition(0, 0)
         //设定一像素的activity
         window.setGravity(Gravity.START or Gravity.TOP)
@@ -41,7 +40,7 @@ class OnePixActivity : Activity() {
     override fun onDestroy() {
         super.onDestroy()
         finishOnePix()
-        Log.d(Constant.CACTUS_TAG, "one pix is destroyed")
+        log("one pix is destroyed")
     }
 
     override fun finish() {

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.util.Log
 import androidx.annotation.RequiresApi
 import com.gyf.cactus.entity.CactusConfig
 import com.gyf.cactus.entity.Constant
@@ -58,15 +57,15 @@ class CactusJobService : JobService() {
     }
 
     override fun onStartJob(jobParameters: JobParameters): Boolean {
-        Log.d(Constant.CACTUS_TAG, "onStartJob")
+        log("onStartJob")
         if (!isServiceRunning && !mIsStop) {
             registerCactus(mCactusConfig)
         }
         return false
     }
 
     override fun onStopJob(jobParameters: JobParameters): Boolean {
-        Log.d(Constant.CACTUS_TAG, "onStopJob")
+        log("onStopJob")
         if (!isServiceRunning && !mIsStop) {
             registerCactus(mCactusConfig)
         }

cactus/src/main/java/com/gyf/cactus/workmanager/CactusWorker.kt

@@ -1,15 +1,11 @@
 package com.gyf.cactus.workmanager
 
 import android.content.Context
-import android.util.Log
 import androidx.work.WorkManager
 import androidx.work.Worker
 import androidx.work.WorkerParameters
 import com.gyf.cactus.entity.Constant
-import com.gyf.cactus.ext.getConfig
-import com.gyf.cactus.ext.isServiceRunning
-import com.gyf.cactus.ext.register
-import com.gyf.cactus.ext.registerStopReceiver
+import com.gyf.cactus.ext.*
 
 /**
  * WorkManager定时器
@@ -37,10 +33,7 @@ class CactusWorker(val context: Context, workerParams: WorkerParameters) :
             context.apply {
                 val cactusConfig = getConfig()
                 if (cactusConfig.defaultConfig.debug) {
-                    Log.d(
-                        Constant.CACTUS_TAG,
-                        "CactusWorker-isServiceRunning:$isServiceRunning"
-                    )
+                    log("CactusWorker-isServiceRunning:$isServiceRunning")
                 }
                 if (!isServiceRunning) {
                     register(cactusConfig)