From 75157b61151e407374eed8d5ef1cac8610535fd4 Mon Sep 17 00:00:00 2001
From: heweizong <heweizong@itouchtv.cn>
Date: Wed, 23 Jan 2019 17:26:07 +0800
Subject: [PATCH] update

---
 README.md                                     |  6 +-
 app/build.gradle                              |  2 +-
 .../com/dovar/router_api/DefaultLogger.java   | 47 -------------
 .../router_api/multiprocess/MultiRouter.java  |  2 +-
 .../multiprocess/MultiRouterRequest.java      |  3 +-
 .../multiprocess/MultiRouterService.java      |  2 -
 .../com/dovar/router_api/router/DRouter.java  |  2 +-
 .../com/dovar/router_api/router/Router.java   |  2 +-
 .../dovar/router_api/router/RouterUtil.java   |  2 +-
 .../dovar/router_api/router/cache/Cache.java  |  2 +-
 .../router/service/RouterRequest.java         |  2 +-
 .../router/service/ServiceLoader.java         |  2 +-
 .../dovar/router_api/router/ui/UIRouter.java  |  2 +-
 .../router_api/{ => utils}/Debugger.java      | 67 ++++++-------------
 .../dovar/router_api/utils/ServiceUtil.java   |  2 -
 15 files changed, 34 insertions(+), 111 deletions(-)
 delete mode 100644 router-api/src/main/java/com/dovar/router_api/DefaultLogger.java
 rename router-api/src/main/java/com/dovar/router_api/{ => utils}/Debugger.java (50%)

diff --git a/README.md b/README.md
index 2f88172..10e3740 100644
--- a/README.md
+++ b/README.md
@@ -15,11 +15,11 @@
 ### 如何配置
 1.在BaseModule中添加依赖：
 
-    api 'com.github.Dovar66.DRouter:router-api:0.0.8'
+    api 'com.github.Dovar66.DRouter:router-api:1.0.0'
 
 2.在其他需要用到DRouter的组件中添加注解处理器的依赖：
 
-    annotationProcessor 'com.github.Dovar66.DRouter:router-compiler:0.0.8'
+    annotationProcessor 'com.github.Dovar66.DRouter:router-compiler:1.0.0'
 
     同时在这些组件的defaultConfig中配置注解参数，指定唯一的组件名：
 
@@ -49,7 +49,7 @@
                 }
             }
             dependencies {
-                classpath "gradle.plugin.RouterPlugin:plugin:1.1.6"
+                classpath "gradle.plugin.RouterPlugin:plugin:1.1.8"
             }
         }
 
diff --git a/app/build.gradle b/app/build.gradle
index ddc3514..1314940 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -9,7 +9,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath "gradle.plugin.RouterPlugin:plugin:1.1.6"
+        classpath "gradle.plugin.RouterPlugin:plugin:1.1.8"
     }
 }
 
diff --git a/router-api/src/main/java/com/dovar/router_api/DefaultLogger.java b/router-api/src/main/java/com/dovar/router_api/DefaultLogger.java
deleted file mode 100644
index 7935dfa..0000000
--- a/router-api/src/main/java/com/dovar/router_api/DefaultLogger.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.dovar.router_api;
-
-import android.util.Log;
-
-public class DefaultLogger implements Debugger.Logger {
-
-    @Override
-    public void d(String msg, Object... args) {
-        Log.d(Debugger.LOG_TAG, format(msg, args));
-    }
-
-    @Override
-    public void i(String msg, Object... args) {
-        Log.i(Debugger.LOG_TAG, format(msg, args));
-    }
-
-    @Override
-    public void w(String msg, Object... args) {
-        Log.w(Debugger.LOG_TAG, format(msg, args));
-    }
-
-    @Override
-    public void w(Throwable t) {
-        Log.w(Debugger.LOG_TAG, t);
-    }
-
-    @Override
-    public void e(String msg, Object... args) {
-        Log.e(Debugger.LOG_TAG, format(msg, args));
-    }
-
-    @Override
-    public void e(Throwable t) {
-        Log.e(Debugger.LOG_TAG, "", t);
-    }
-
-    protected String format(String msg, Object... args) {
-        if (args != null && args.length > 0) {
-            try {
-                return String.format(msg, args);
-            } catch (Throwable t) {
-                e(t);
-            }
-        }
-        return msg;
-    }
-}
diff --git a/router-api/src/main/java/com/dovar/router_api/multiprocess/MultiRouter.java b/router-api/src/main/java/com/dovar/router_api/multiprocess/MultiRouter.java
index 73764fd..cd88dde 100644
--- a/router-api/src/main/java/com/dovar/router_api/multiprocess/MultiRouter.java
+++ b/router-api/src/main/java/com/dovar/router_api/multiprocess/MultiRouter.java
@@ -12,7 +12,7 @@
 import android.support.annotation.NonNull;
 import android.text.TextUtils;
 
-import com.dovar.router_api.Debugger;
+import com.dovar.router_api.utils.Debugger;
 import com.dovar.router_api.ILocalRouterAIDL;
 import com.dovar.router_api.router.Router;
 import com.dovar.router_api.router.RouterUtil;
diff --git a/router-api/src/main/java/com/dovar/router_api/multiprocess/MultiRouterRequest.java b/router-api/src/main/java/com/dovar/router_api/multiprocess/MultiRouterRequest.java
index 797be3e..a6d6ece 100644
--- a/router-api/src/main/java/com/dovar/router_api/multiprocess/MultiRouterRequest.java
+++ b/router-api/src/main/java/com/dovar/router_api/multiprocess/MultiRouterRequest.java
@@ -3,10 +3,9 @@
 import android.os.Bundle;
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.NonNull;
 import android.text.TextUtils;
 
-import com.dovar.router_api.Debugger;
+import com.dovar.router_api.utils.Debugger;
 import com.dovar.router_api.router.Router;
 
 import java.io.Serializable;
diff --git a/router-api/src/main/java/com/dovar/router_api/multiprocess/MultiRouterService.java b/router-api/src/main/java/com/dovar/router_api/multiprocess/MultiRouterService.java
index 088167c..39a91df 100644
--- a/router-api/src/main/java/com/dovar/router_api/multiprocess/MultiRouterService.java
+++ b/router-api/src/main/java/com/dovar/router_api/multiprocess/MultiRouterService.java
@@ -8,9 +8,7 @@
 import android.support.annotation.Nullable;
 import android.text.TextUtils;
 
-import com.dovar.router_api.Debugger;
 import com.dovar.router_api.IMultiRouter;
-import com.dovar.router_api.router.Router;
 
 
 /**
diff --git a/router-api/src/main/java/com/dovar/router_api/router/DRouter.java b/router-api/src/main/java/com/dovar/router_api/router/DRouter.java
index c4f00e8..5be02ee 100644
--- a/router-api/src/main/java/com/dovar/router_api/router/DRouter.java
+++ b/router-api/src/main/java/com/dovar/router_api/router/DRouter.java
@@ -6,7 +6,7 @@
 import android.os.Bundle;
 import android.support.annotation.NonNull;
 
-import com.dovar.router_api.Debugger;
+import com.dovar.router_api.utils.Debugger;
 import com.dovar.router_api.multiprocess.MultiRouterRequest;
 import com.dovar.router_api.router.eventbus.EventCallback;
 import com.dovar.router_api.router.service.RouterRequest;
diff --git a/router-api/src/main/java/com/dovar/router_api/router/Router.java b/router-api/src/main/java/com/dovar/router_api/router/Router.java
index 410ae0d..906f7d3 100644
--- a/router-api/src/main/java/com/dovar/router_api/router/Router.java
+++ b/router-api/src/main/java/com/dovar/router_api/router/Router.java
@@ -15,7 +15,7 @@
 import android.support.annotation.Nullable;
 import android.text.TextUtils;
 
-import com.dovar.router_api.Debugger;
+import com.dovar.router_api.utils.Debugger;
 import com.dovar.router_api.IMultiRouter;
 import com.dovar.router_api.multiprocess.IMultiProcess;
 import com.dovar.router_api.multiprocess.MultiRouterRequest;
diff --git a/router-api/src/main/java/com/dovar/router_api/router/RouterUtil.java b/router-api/src/main/java/com/dovar/router_api/router/RouterUtil.java
index fc7086d..b5252ba 100644
--- a/router-api/src/main/java/com/dovar/router_api/router/RouterUtil.java
+++ b/router-api/src/main/java/com/dovar/router_api/router/RouterUtil.java
@@ -10,7 +10,7 @@
 import android.support.annotation.NonNull;
 import android.text.TextUtils;
 
-import com.dovar.router_api.Debugger;
+import com.dovar.router_api.utils.Debugger;
 import com.dovar.router_api.multiprocess.MultiRouterRequest;
 import com.dovar.router_api.multiprocess.MultiRouterResponse;
 import com.dovar.router_api.router.service.RouterRequest;
diff --git a/router-api/src/main/java/com/dovar/router_api/router/cache/Cache.java b/router-api/src/main/java/com/dovar/router_api/router/cache/Cache.java
index 2f8685e..84aad23 100644
--- a/router-api/src/main/java/com/dovar/router_api/router/cache/Cache.java
+++ b/router-api/src/main/java/com/dovar/router_api/router/cache/Cache.java
@@ -5,7 +5,7 @@
 import android.content.pm.PackageManager;
 
 import com.dovar.router_annotation.string.RouterStr;
-import com.dovar.router_api.Debugger;
+import com.dovar.router_api.utils.Debugger;
 import com.dovar.router_api.compiler.RouterInjector;
 import com.dovar.router_api.compiler.RouterMapCreator;
 import com.dovar.router_api.router.RouterUtil;
diff --git a/router-api/src/main/java/com/dovar/router_api/router/service/RouterRequest.java b/router-api/src/main/java/com/dovar/router_api/router/service/RouterRequest.java
index 0ee42e2..369619b 100644
--- a/router-api/src/main/java/com/dovar/router_api/router/service/RouterRequest.java
+++ b/router-api/src/main/java/com/dovar/router_api/router/service/RouterRequest.java
@@ -4,7 +4,7 @@
 import android.support.annotation.NonNull;
 import android.text.TextUtils;
 
-import com.dovar.router_api.Debugger;
+import com.dovar.router_api.utils.Debugger;
 import com.dovar.router_api.router.Router;
 
 import java.io.Serializable;
diff --git a/router-api/src/main/java/com/dovar/router_api/router/service/ServiceLoader.java b/router-api/src/main/java/com/dovar/router_api/router/service/ServiceLoader.java
index 8c4307c..ee7d27d 100644
--- a/router-api/src/main/java/com/dovar/router_api/router/service/ServiceLoader.java
+++ b/router-api/src/main/java/com/dovar/router_api/router/service/ServiceLoader.java
@@ -2,7 +2,7 @@
 
 import android.support.annotation.NonNull;
 
-import com.dovar.router_api.Debugger;
+import com.dovar.router_api.utils.Debugger;
 import com.dovar.router_api.router.cache.Cache;
 
 import java.util.HashMap;
diff --git a/router-api/src/main/java/com/dovar/router_api/router/ui/UIRouter.java b/router-api/src/main/java/com/dovar/router_api/router/ui/UIRouter.java
index 4cff83c..0360788 100644
--- a/router-api/src/main/java/com/dovar/router_api/router/ui/UIRouter.java
+++ b/router-api/src/main/java/com/dovar/router_api/router/ui/UIRouter.java
@@ -11,7 +11,7 @@
 import android.support.v4.app.FragmentActivity;
 import android.text.TextUtils;
 
-import com.dovar.router_api.Debugger;
+import com.dovar.router_api.utils.Debugger;
 import com.dovar.router_api.router.cache.Cache;
 import com.dovar.router_api.router.ui.forresult.Activity4ResultUtil;
 import com.dovar.router_api.router.ui.forresult.Callback;
diff --git a/router-api/src/main/java/com/dovar/router_api/Debugger.java b/router-api/src/main/java/com/dovar/router_api/utils/Debugger.java
similarity index 50%
rename from router-api/src/main/java/com/dovar/router_api/Debugger.java
rename to router-api/src/main/java/com/dovar/router_api/utils/Debugger.java
index 3ce4d0a..b24a21d 100644
--- a/router-api/src/main/java/com/dovar/router_api/Debugger.java
+++ b/router-api/src/main/java/com/dovar/router_api/utils/Debugger.java
@@ -1,39 +1,13 @@
-package com.dovar.router_api;
+package com.dovar.router_api.utils;
 
-import android.support.annotation.Nullable;
 import android.text.TextUtils;
+import android.util.Log;
 
 
 public class Debugger {
-    public static final String LOG_TAG = "DRouter";
-
-    public interface Logger {
-
-        void d(String msg, Object... args);
-
-        void i(String msg, Object... args);
-
-        void w(String msg, Object... args);
-
-        void w(Throwable t);
-
-        void e(String msg, Object... args);
-
-        void e(Throwable t);
-    }
-
-    @Nullable
-    private static Logger sLogger = new DefaultLogger();
-
+    private static final String LOG_TAG = "DRouter";
     private static boolean sEnableLog = false;
 
-    /**
-     * 设置Logger
-     */
-    public static void setLogger(Logger logger) {
-        sLogger = logger;
-    }
-
     /**
      * Log开关。建议测试环境开启，线上环境应该关闭。
      */
@@ -44,46 +18,47 @@ public static void setEnableLog(boolean enableLog) {
     public static void d(String msg, Object... args) {
         if (!sEnableLog) return;
         if (TextUtils.isEmpty(msg)) return;
-        if (sLogger != null) {
-            sLogger.d(msg, args);
-        }
+        Log.d(Debugger.LOG_TAG, format(msg, args));
     }
 
     public static void i(String msg, Object... args) {
         if (!sEnableLog) return;
         if (TextUtils.isEmpty(msg)) return;
-        if (sLogger != null) {
-            sLogger.i(msg, args);
-        }
+        Log.i(Debugger.LOG_TAG, format(msg, args));
     }
 
     public static void w(String msg, Object... args) {
         if (!sEnableLog) return;
         if (TextUtils.isEmpty(msg)) return;
-        if (sLogger != null) {
-            sLogger.w(msg, args);
-        }
+        Log.w(Debugger.LOG_TAG, format(msg, args));
     }
 
     public static void w(Throwable t) {
         if (!sEnableLog) return;
-        if (sLogger != null) {
-            sLogger.w(t);
-        }
+        if (t == null) return;
+        Log.w(Debugger.LOG_TAG, t);
     }
 
     public static void e(String msg, Object... args) {
         if (!sEnableLog) return;
         if (TextUtils.isEmpty(msg)) return;
-        if (sLogger != null) {
-            sLogger.e(msg, args);
-        }
+        Log.e(Debugger.LOG_TAG, format(msg, args));
     }
 
     public static void e(Throwable t) {
         if (!sEnableLog) return;
-        if (sLogger != null) {
-            sLogger.e(t);
+        if (t == null) return;
+        Log.e(Debugger.LOG_TAG, "", t);
+    }
+
+    private static String format(String msg, Object... args) {
+        if (args != null && args.length > 0) {
+            try {
+                return String.format(msg, args);
+            } catch (Throwable t) {
+                e(t);
+            }
         }
+        return msg;
     }
 }
diff --git a/router-api/src/main/java/com/dovar/router_api/utils/ServiceUtil.java b/router-api/src/main/java/com/dovar/router_api/utils/ServiceUtil.java
index 1931313..b04517e 100644
--- a/router-api/src/main/java/com/dovar/router_api/utils/ServiceUtil.java
+++ b/router-api/src/main/java/com/dovar/router_api/utils/ServiceUtil.java
@@ -4,8 +4,6 @@
 import android.content.Intent;
 import android.content.ServiceConnection;
 
-import com.dovar.router_api.Debugger;
-
 public class ServiceUtil {
     /**
      * 考虑到Android 8.0在后台调用startService时会抛出IllegalStateException