Skip to content

Commit 75157b6

Browse files
author
heweizong
committed
update
1 parent e9ccc37 commit 75157b6

15 files changed

+34
-111
lines changed

‎README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@
1515
### 如何配置
1616
1.在BaseModule中添加依赖：
1717

18-
api 'com.github.Dovar66.DRouter:router-api:0.0.8'
18+
api 'com.github.Dovar66.DRouter:router-api:1.0.0'
1919

2020
2.在其他需要用到DRouter的组件中添加注解处理器的依赖：
2121

22-
annotationProcessor 'com.github.Dovar66.DRouter:router-compiler:0.0.8'
22+
annotationProcessor 'com.github.Dovar66.DRouter:router-compiler:1.0.0'
2323

2424
同时在这些组件的defaultConfig中配置注解参数，指定唯一的组件名：
2525

@@ -49,7 +49,7 @@
4949
}
5050
}
5151
dependencies {
52-
classpath "gradle.plugin.RouterPlugin:plugin:1.1.6"
52+
classpath "gradle.plugin.RouterPlugin:plugin:1.1.8"
5353
}
5454
}
5555

‎app/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ buildscript {
99
}
1010
}
1111
dependencies {
12-
classpath "gradle.plugin.RouterPlugin:plugin:1.1.6"
12+
classpath "gradle.plugin.RouterPlugin:plugin:1.1.8"
1313
}
1414
}
1515

‎router-api/src/main/java/com/dovar/router_api/DefaultLogger.java

-47
This file was deleted.

‎router-api/src/main/java/com/dovar/router_api/multiprocess/MultiRouter.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
import android.support.annotation.NonNull;
1313
import android.text.TextUtils;
1414

15-
import com.dovar.router_api.Debugger;
15+
import com.dovar.router_api.utils.Debugger;
1616
import com.dovar.router_api.ILocalRouterAIDL;
1717
import com.dovar.router_api.router.Router;
1818
import com.dovar.router_api.router.RouterUtil;

‎router-api/src/main/java/com/dovar/router_api/multiprocess/MultiRouterRequest.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,9 @@
33
import android.os.Bundle;
44
import android.os.Parcel;
55
import android.os.Parcelable;
6-
import android.support.annotation.NonNull;
76
import android.text.TextUtils;
87

9-
import com.dovar.router_api.Debugger;
8+
import com.dovar.router_api.utils.Debugger;
109
import com.dovar.router_api.router.Router;
1110

1211
import java.io.Serializable;

‎router-api/src/main/java/com/dovar/router_api/multiprocess/MultiRouterService.java

-2
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,7 @@
88
import android.support.annotation.Nullable;
99
import android.text.TextUtils;
1010

11-
import com.dovar.router_api.Debugger;
1211
import com.dovar.router_api.IMultiRouter;
13-
import com.dovar.router_api.router.Router;
1412

1513

1614
/**

‎router-api/src/main/java/com/dovar/router_api/router/DRouter.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import android.os.Bundle;
77
import android.support.annotation.NonNull;
88

9-
import com.dovar.router_api.Debugger;
9+
import com.dovar.router_api.utils.Debugger;
1010
import com.dovar.router_api.multiprocess.MultiRouterRequest;
1111
import com.dovar.router_api.router.eventbus.EventCallback;
1212
import com.dovar.router_api.router.service.RouterRequest;

‎router-api/src/main/java/com/dovar/router_api/router/Router.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
import android.support.annotation.Nullable;
1616
import android.text.TextUtils;
1717

18-
import com.dovar.router_api.Debugger;
18+
import com.dovar.router_api.utils.Debugger;
1919
import com.dovar.router_api.IMultiRouter;
2020
import com.dovar.router_api.multiprocess.IMultiProcess;
2121
import com.dovar.router_api.multiprocess.MultiRouterRequest;

‎router-api/src/main/java/com/dovar/router_api/router/RouterUtil.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
import android.support.annotation.NonNull;
1111
import android.text.TextUtils;
1212

13-
import com.dovar.router_api.Debugger;
13+
import com.dovar.router_api.utils.Debugger;
1414
import com.dovar.router_api.multiprocess.MultiRouterRequest;
1515
import com.dovar.router_api.multiprocess.MultiRouterResponse;
1616
import com.dovar.router_api.router.service.RouterRequest;

‎router-api/src/main/java/com/dovar/router_api/router/cache/Cache.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import android.content.pm.PackageManager;
66

77
import com.dovar.router_annotation.string.RouterStr;
8-
import com.dovar.router_api.Debugger;
8+
import com.dovar.router_api.utils.Debugger;
99
import com.dovar.router_api.compiler.RouterInjector;
1010
import com.dovar.router_api.compiler.RouterMapCreator;
1111
import com.dovar.router_api.router.RouterUtil;

‎router-api/src/main/java/com/dovar/router_api/router/service/RouterRequest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import android.support.annotation.NonNull;
55
import android.text.TextUtils;
66

7-
import com.dovar.router_api.Debugger;
7+
import com.dovar.router_api.utils.Debugger;
88
import com.dovar.router_api.router.Router;
99

1010
import java.io.Serializable;

‎router-api/src/main/java/com/dovar/router_api/router/service/ServiceLoader.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import android.support.annotation.NonNull;
44

5-
import com.dovar.router_api.Debugger;
5+
import com.dovar.router_api.utils.Debugger;
66
import com.dovar.router_api.router.cache.Cache;
77

88
import java.util.HashMap;

‎router-api/src/main/java/com/dovar/router_api/router/ui/UIRouter.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
import android.support.v4.app.FragmentActivity;
1212
import android.text.TextUtils;
1313

14-
import com.dovar.router_api.Debugger;
14+
import com.dovar.router_api.utils.Debugger;
1515
import com.dovar.router_api.router.cache.Cache;
1616
import com.dovar.router_api.router.ui.forresult.Activity4ResultUtil;
1717
import com.dovar.router_api.router.ui.forresult.Callback;

‎router-api/src/main/java/com/dovar/router_api/Debugger.java ‎router-api/src/main/java/com/dovar/router_api/utils/Debugger.java

+21-46
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,13 @@
1-
package com.dovar.router_api;
1+
package com.dovar.router_api.utils;
22

3-
import android.support.annotation.Nullable;
43
import android.text.TextUtils;
4+
import android.util.Log;
55

66

77
public class Debugger {
8-
public static final String LOG_TAG = "DRouter";
9-
10-
public interface Logger {
11-
12-
void d(String msg, Object... args);
13-
14-
void i(String msg, Object... args);
15-
16-
void w(String msg, Object... args);
17-
18-
void w(Throwable t);
19-
20-
void e(String msg, Object... args);
21-
22-
void e(Throwable t);
23-
}
24-
25-
@Nullable
26-
private static Logger sLogger = new DefaultLogger();
27-
8+
private static final String LOG_TAG = "DRouter";
289
private static boolean sEnableLog = false;
2910

30-
/**
31-
* 设置Logger
32-
*/
33-
public static void setLogger(Logger logger) {
34-
sLogger = logger;
35-
}
36-
3711
/**
3812
* Log开关。建议测试环境开启，线上环境应该关闭。
3913
*/
@@ -44,46 +18,47 @@ public static void setEnableLog(boolean enableLog) {
4418
public static void d(String msg, Object... args) {
4519
if (!sEnableLog) return;
4620
if (TextUtils.isEmpty(msg)) return;
47-
if (sLogger != null) {
48-
sLogger.d(msg, args);
49-
}
21+
Log.d(Debugger.LOG_TAG, format(msg, args));
5022
}
5123

5224
public static void i(String msg, Object... args) {
5325
if (!sEnableLog) return;
5426
if (TextUtils.isEmpty(msg)) return;
55-
if (sLogger != null) {
56-
sLogger.i(msg, args);
57-
}
27+
Log.i(Debugger.LOG_TAG, format(msg, args));
5828
}
5929

6030
public static void w(String msg, Object... args) {
6131
if (!sEnableLog) return;
6232
if (TextUtils.isEmpty(msg)) return;
63-
if (sLogger != null) {
64-
sLogger.w(msg, args);
65-
}
33+
Log.w(Debugger.LOG_TAG, format(msg, args));
6634
}
6735

6836
public static void w(Throwable t) {
6937
if (!sEnableLog) return;
70-
if (sLogger != null) {
71-
sLogger.w(t);
72-
}
38+
if (t == null) return;
39+
Log.w(Debugger.LOG_TAG, t);
7340
}
7441

7542
public static void e(String msg, Object... args) {
7643
if (!sEnableLog) return;
7744
if (TextUtils.isEmpty(msg)) return;
78-
if (sLogger != null) {
79-
sLogger.e(msg, args);
80-
}
45+
Log.e(Debugger.LOG_TAG, format(msg, args));
8146
}
8247

8348
public static void e(Throwable t) {
8449
if (!sEnableLog) return;
85-
if (sLogger != null) {
86-
sLogger.e(t);
50+
if (t == null) return;
51+
Log.e(Debugger.LOG_TAG, "", t);
52+
}
53+
54+
private static String format(String msg, Object... args) {
55+
if (args != null && args.length > 0) {
56+
try {
57+
return String.format(msg, args);
58+
} catch (Throwable t) {
59+
e(t);
60+
}
8761
}
62+
return msg;
8863
}
8964
}

‎router-api/src/main/java/com/dovar/router_api/utils/ServiceUtil.java

-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
import android.content.Intent;
55
import android.content.ServiceConnection;
66

7-
import com.dovar.router_api.Debugger;
8-
97
public class ServiceUtil {
108
/**
119
* 考虑到Android 8.0在后台调用startService时会抛出IllegalStateException

0 commit comments

Comments
 (0)