Skip to content

Commit 5b5d45c

Browse files
BlankjBlankj
committed
see 07/15 log
1 parent c80b6a1 commit 5b5d45c

27 files changed

+406
-371
lines changed

‎CHANGELOG.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
* `19/07/10` [upd] Bus plugin for use BusUtils. Publish bus plugin v2.0.
2-
* `19/07/10` [add] Api plugin for use ApiUtils. Publish api plugin v1.0.
1+
* `19/07/15` [upd] Bus plugin for use BusUtils. Publish bus plugin v2.0.
2+
* `19/07/15` [add] Api plugin for use ApiUtils. Publish api plugin v1.0.
33
* `19/07/09` [upd] The frame of project.
44
* `19/07/06` [upd] BusUtils which behave same as EventBus.
55
* `19/07/03` [add] ApiUtils which decoupling modules.
@@ -95,7 +95,7 @@
9595
* `18/06/13` 新增 CacheMemoryUtils 和 CacheDoubleUtils
9696
* `18/06/12` 完善 FragmentUtils#add 和 replace 新增 tag
9797
* `18/05/30` 完善 DeviceUtils#getMacAddress，发布 1.16.4 版本
98-
* `18/05/30` 修复 ToastUtils 在 targetSdkVersion 为 27 在 result 25 机器快速 show 两次崩溃的异常，发布 1.16.3 版本
98+
* `18/05/30` 修复 ToastUtils 在 targetSdkVersion 为 27 在 api 25 机器快速 show 两次崩溃的异常，发布 1.16.3 版本
9999
* `18/05/29` 完善 TimeUtils 的 timeSpan 带符号位，ToastUtils 去除弱引用，发布 1.16.2 版本
100100
* `18/05/25` 新增 AppUtils#registerAppStatusChangedListener 和 AppUtils#unregisterAppStatusChangedListener，发布 1.16.1 版本
101101
* `18/05/22` 新增 ThreadUtils，发布 1.16.0 版本

‎art/auc_frame.png

80 KB
Loading

‎art/communication.png

19 KB
Loading

‎buildApp.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,8 @@ dependencies {
6868
}
6969

7070
def getSuffix() {
71-
if (project.path == ":app:launcher:app") return ""
72-
return project.path.replace(":", "_").substring(4, project.path.length() - 4)
71+
if (project.path == ":feature:launcher:app") return ""
72+
return project.path.replace(":", "_").substring(":feature".length(), project.path.length() - ":app".length())
7373
}
7474

7575
def configSigning() {

‎buildSrc/src/main/groovy/Config.groovy

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ class Config {
1414
static compileSdkVersion = 27
1515
static minSdkVersion = 14
1616
static targetSdkVersion = 27
17-
static versionCode = 1_024_007
18-
static versionName = '1.24.7'// E.g. 1.9.72 => 1,009,072
17+
static versionCode = 1_025_000
18+
static versionName = '1.25.0'// E.g. 1.9.72 => 1,009,072
1919

2020
// lib version
2121
static kotlin_version = '1.3.10'
@@ -25,7 +25,7 @@ class Config {
2525
// appConfig 配置的是可以跑 app 的模块，git 提交务必只包含 launcher
2626
static appConfig = ['launcher']
2727
// pkgConfig 配置的是要依赖的功能包，为空则依赖全部，git 提交务必为空
28-
static pkgConfig = ['main', 'utilcode']
28+
static pkgConfig = []
2929

3030
static depConfig = [
3131
plugin : [
@@ -38,12 +38,12 @@ class Config {
3838
// 本地第一次上传插件新的版本需设置 useLocal = true, isApply = false
3939
// 本地上传成功之后 isApply = true 即可应用插件来调试，后续版本更新无需设置 isApply = false
4040
// 发布版本的话把 useLocal = false, isApply = false，发布成功后 isApply = true 即可使用远程库版本
41-
api : new DepConfig(true/*是否本地调试*/, "com.blankj:api-gradle-plugin:1.0", true/*是否使用插件*/),
42-
bus : new DepConfig(true/*是否本地调试*/, "com.blankj:bus-gradle-plugin:2.0", true/*是否使用插件*/),
41+
api : new DepConfig(false/*是否本地调试*/, "com.blankj:api-gradle-plugin:1.0", true/*是否使用插件*/),
42+
bus : new DepConfig(false/*是否本地调试*/, "com.blankj:bus-gradle-plugin:2.0", true/*是否使用插件*/),
4343
],
4444

45-
api_gradle_plugin: new DepConfig(":plugin:api-gradle-plugin", true),
46-
bus_gradle_plugin: new DepConfig(":plugin:bus-gradle-plugin", true),
45+
api_gradle_plugin: new DepConfig(":plugin:api-gradle-plugin", false),
46+
bus_gradle_plugin: new DepConfig(":plugin:bus-gradle-plugin", false),
4747

4848
feature : [
4949
mock : new DepConfig(":feature:mock"),
@@ -107,4 +107,4 @@ class Config {
107107
],
108108
]
109109
}
110-
//./gradlew clean :utilcode:lib:bintrayUpload
110+
//./gradlew clean :lib:utilcode:bintrayUpload

‎buildSrc/src/main/groovy/DepConfig.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ class DepConfig {
3232
}
3333

3434
DepConfig(boolean useLocal, String path, boolean isApply) { // 自定义插件的构造函数
35-
this(useLocal, "", path, true)
35+
this(useLocal, "", path, isApply)
3636
}
3737

3838
DepConfig(boolean useLocal, String localPath, String remotePath) {

‎lib/subutil/README-CN.md

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -77,23 +77,23 @@ getSurnameFirstLetter: 根据名字获取姓氏的首字母
7777

7878

7979

80-
[appStore.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/subutil/lib/src/main/java/com/blankj/subutil/util/AppStoreUtils.java
81-
[appStore.demo]: https://github.com/Blankj/AndroidUtilCode/blob/master/subutil/pkg/src/main/java/com/blankj/subutil/pkg/feature/appStore/AppStoreActivity.kt
80+
[appStore.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/lib/subutil/src/main/java/com/blankj/subutil/util/AppStoreUtils.java
81+
[appStore.demo]: https://github.com/Blankj/AndroidUtilCode/blob/master/feature/subutil/pkg/src/main/java/com/blankj/subutil/pkg/feature/appStore/AppStoreActivity.kt
8282

83-
[clipboard.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/subutil/lib/src/main/java/com/blankj/subutil/util/ClipboardUtils.java
84-
[clipboard.test]: https://github.com/Blankj/AndroidUtilCode/blob/master/subutil/lib/src/test/java/com/blankj/subutil/util/ClipboardUtilsTest.java
83+
[clipboard.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/lib/subutil/src/main/java/com/blankj/subutil/util/ClipboardUtils.java
84+
[clipboard.test]: https://github.com/Blankj/AndroidUtilCode/blob/master/lib/subutil/src/test/java/com/blankj/subutil/util/ClipboardUtilsTest.java
8585

86-
[coordinate.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/subutil/lib/src/main/java/com/blankj/subutil/util/CoordinateUtils.java
87-
[coordinate.test]: https://github.com/Blankj/AndroidUtilCode/blob/master/subutil/lib/src/test/java/com/blankj/subutil/util/CoordinateUtilsTest.java
86+
[coordinate.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/lib/subutil/src/main/java/com/blankj/subutil/util/CoordinateUtils.java
87+
[coordinate.test]: https://github.com/Blankj/AndroidUtilCode/blob/master/lib/subutil/src/test/java/com/blankj/subutil/util/CoordinateUtilsTest.java
8888

89-
[country.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/subutil/lib/src/main/java/com/blankj/subutil/util/CountryUtils.java
90-
[country.demo]: https://github.com/Blankj/AndroidUtilCode/blob/master/subutil/pkg/src/main/java/com/blankj/subutil/pkg/feature/country/CountryActivity.kt
89+
[country.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/lib/subutil/src/main/java/com/blankj/subutil/util/CountryUtils.java
90+
[country.demo]: https://github.com/Blankj/AndroidUtilCode/blob/master/feature/subutil/pkg/src/main/java/com/blankj/subutil/pkg/feature/country/CountryActivity.kt
9191

92-
[dangerous.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/subutil/lib/src/main/java/com/blankj/subutil/util/DangerousUtils.java
93-
[dangerous.demo]: https://github.com/Blankj/AndroidUtilCode/blob/master/subutil/pkg/src/main/java/com/blankj/subutil/pkg/feature/dangerous/DangerousActivity.kt
92+
[dangerous.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/lib/subutil/src/main/java/com/blankj/subutil/util/DangerousUtils.java
93+
[dangerous.demo]: https://github.com/Blankj/AndroidUtilCode/blob/master/feature/subutil/pkg/src/main/java/com/blankj/subutil/pkg/feature/dangerous/DangerousActivity.kt
9494

95-
[location.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/subutil/lib/src/main/java/com/blankj/subutil/util/LocationUtils.java
96-
[location.demo]: https://github.com/Blankj/AndroidUtilCode/blob/master/subutil/pkg/src/main/java/com/blankj/subutil/pkg/feature/location/LocationActivity.kt
95+
[location.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/lib/subutil/src/main/java/com/blankj/subutil/util/LocationUtils.java
96+
[location.demo]: https://github.com/Blankj/AndroidUtilCode/blob/master/feature/subutil/pkg/src/main/java/com/blankj/subutil/pkg/feature/location/LocationActivity.kt
9797

98-
[pinyin.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/subutil/lib/src/main/java/com/blankj/subutil/util/PinyinUtils.java
99-
[pinyin.demo]: https://github.com/Blankj/AndroidUtilCode/blob/master/subutil/pkg/src/main/java/com/blankj/subutil/pkg/feature/pinyin/PinyinActivity.kt
98+
[pinyin.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/lib/subutil/src/main/java/com/blankj/subutil/util/PinyinUtils.java
99+
[pinyin.demo]: https://github.com/Blankj/AndroidUtilCode/blob/master/feature/subutil/pkg/src/main/java/com/blankj/subutil/pkg/feature/pinyin/PinyinActivity.kt

‎lib/subutil/README.md

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -77,23 +77,23 @@ getSurnameFirstLetter
7777

7878

7979

80-
[appStore.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/subutil/lib/src/main/java/com/blankj/subutil/util/AppStoreUtils.java
81-
[appStore.demo]: https://github.com/Blankj/AndroidUtilCode/blob/master/subutil/pkg/src/main/java/com/blankj/subutil/pkg/feature/appStore/AppStoreActivity.kt
80+
[appStore.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/lib/subutil/src/main/java/com/blankj/subutil/util/AppStoreUtils.java
81+
[appStore.demo]: https://github.com/Blankj/AndroidUtilCode/blob/master/feature/subutil/pkg/src/main/java/com/blankj/subutil/pkg/feature/appStore/AppStoreActivity.kt
8282

83-
[clipboard.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/subutil/lib/src/main/java/com/blankj/subutil/util/ClipboardUtils.java
84-
[clipboard.test]: https://github.com/Blankj/AndroidUtilCode/blob/master/subutil/lib/src/test/java/com/blankj/subutil/util/ClipboardUtilsTest.java
83+
[clipboard.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/lib/subutil/src/main/java/com/blankj/subutil/util/ClipboardUtils.java
84+
[clipboard.test]: https://github.com/Blankj/AndroidUtilCode/blob/master/lib/subutil/src/test/java/com/blankj/subutil/util/ClipboardUtilsTest.java
8585

86-
[coordinate.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/subutil/lib/src/main/java/com/blankj/subutil/util/CoordinateUtils.java
87-
[coordinate.test]: https://github.com/Blankj/AndroidUtilCode/blob/master/subutil/lib/src/test/java/com/blankj/subutil/util/CoordinateUtilsTest.java
86+
[coordinate.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/lib/subutil/src/main/java/com/blankj/subutil/util/CoordinateUtils.java
87+
[coordinate.test]: https://github.com/Blankj/AndroidUtilCode/blob/master/lib/subutil/src/test/java/com/blankj/subutil/util/CoordinateUtilsTest.java
8888

89-
[country.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/subutil/lib/src/main/java/com/blankj/subutil/util/CountryUtils.java
90-
[country.demo]: https://github.com/Blankj/AndroidUtilCode/blob/master/subutil/pkg/src/main/java/com/blankj/subutil/pkg/feature/country/CountryActivity.kt
89+
[country.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/lib/subutil/src/main/java/com/blankj/subutil/util/CountryUtils.java
90+
[country.demo]: https://github.com/Blankj/AndroidUtilCode/blob/master/feature/subutil/pkg/src/main/java/com/blankj/subutil/pkg/feature/country/CountryActivity.kt
9191

92-
[dangerous.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/subutil/lib/src/main/java/com/blankj/subutil/util/DangerousUtils.java
93-
[dangerous.demo]: https://github.com/Blankj/AndroidUtilCode/blob/master/subutil/pkg/src/main/java/com/blankj/subutil/pkg/feature/dangerous/DangerousActivity.kt
92+
[dangerous.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/lib/subutil/src/main/java/com/blankj/subutil/util/DangerousUtils.java
93+
[dangerous.demo]: https://github.com/Blankj/AndroidUtilCode/blob/master/feature/subutil/pkg/src/main/java/com/blankj/subutil/pkg/feature/dangerous/DangerousActivity.kt
9494

95-
[location.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/subutil/lib/src/main/java/com/blankj/subutil/util/LocationUtils.java
96-
[location.demo]: https://github.com/Blankj/AndroidUtilCode/blob/master/subutil/pkg/src/main/java/com/blankj/subutil/pkg/feature/location/LocationActivity.kt
95+
[location.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/lib/subutil/src/main/java/com/blankj/subutil/util/LocationUtils.java
96+
[location.demo]: https://github.com/Blankj/AndroidUtilCode/blob/master/feature/subutil/pkg/src/main/java/com/blankj/subutil/pkg/feature/location/LocationActivity.kt
9797

98-
[pinyin.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/subutil/lib/src/main/java/com/blankj/subutil/util/PinyinUtils.java
99-
[pinyin.demo]: https://github.com/Blankj/AndroidUtilCode/blob/master/subutil/pkg/src/main/java/com/blankj/subutil/pkg/feature/pinyin/PinyinActivity.kt
98+
[pinyin.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/lib/subutil/src/main/java/com/blankj/subutil/util/PinyinUtils.java
99+
[pinyin.demo]: https://github.com/Blankj/AndroidUtilCode/blob/master/feature/subutil/pkg/src/main/java/com/blankj/subutil/pkg/feature/pinyin/PinyinActivity.kt

‎lib/utilcode/README-API.md

Lines changed: 16 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,72 +1,54 @@
1-
![logo][logo]
1+
# ApiUtils
22

33
## 关于
44

5-
组件化开发会涉及到模块与模块之间相互调用，而各模块之间又是解偶的，所以就产生了很多路由方案，或者是把接口下沉到 `base` 组件中，但在 **[StaticBus][bus]** 看来，它们都略显复杂，**[StaticBus][bus]** 只需调用一个静态函数便可自由穿梭于各个模块，就像一辆巴士，由于是基于静态函数来实现，所以称她为 **[StaticBus][bus]**，如今已支持 Kotlin。
5+
组件化开发会涉及到模块与模块之的相互调用，而各模块之间又是解偶的，所以就产生了很多路由方案，或者是把接口下沉到 `base` 组件中，在 AucFrame 架构中，我们可以通过 ApiUtils 来自由调用各模块的 APIs，各业务通过对外提供 export 模块来供其他业务方使用，自身实现 export 中的接口即可。AucFrame 结构如下图所示：
6+
7+
![AucFrame](https://raw.githubusercontent.com/Blankj/AndroidUtilCode/master/art/auc_frame.png)
8+
9+
ApiUtils 扮演的角色如下所示：
10+
11+
![ApiUtilsPlayer](https://raw.githubusercontent.com/Blankj/AndroidUtilCode/master/art/communication.png)
12+
13+
当然，在正常项目中你也可以使用 ApiUtils，下面来介绍其使用方式。
614

715

816
## 基本使用
917

10-
在项目根目录的 `build.gradle` 中添加 `bus` 插件：
18+
在项目根目录的 `build.gradle` 中添加 `api` 插件：
1119

1220
```groovy
1321
buildscript {
1422
dependencies {
1523
...
16-
classpath 'com.blankj:bus-gradle-plugin:2.0'
24+
classpath 'com.blankj:api-gradle-plugin:1.0'
1725
}
1826
}
1927
```
2028

2129
然后在 application 模块中使用该插件：
2230

2331
```groovy
24-
apply plugin: "com.blankj.bus"
32+
apply plugin: "com.blankj.api"
2533
```
2634

2735
给 base 模块添加 [AndroidUtilCode](https://github.com/Blankj/AndroidUtilCode) 依赖：
2836

2937
```groovy
30-
result "com.blankj:utilcode:1.25.0"
38+
api "com.blankj:utilcode:1.25.0"
3139
```
3240

33-
比如 module0 中存在的 `Module0Activity.java`，我们通常都是在它内部写一个 `start` 函数来启动它，现在我们给它添加 `@BusUtils.Subscribe` 注解，并给注解的 `name` 赋唯一值，要注意，函数务必要 `public static` 哦：
41+
比如 feature0 中存在的 `Feature0Activity.java`，我们通常都是在它内部写一个 `start` 函数来启动它，现在我们通过 ApiUtils 来启动它，建立一个抽象类 `Feature0Api` 如下所示：
3442

3543
```java
36-
// java
37-
public class Module0Activity extends Activity {
38-
39-
@BusUtils.Subscribe(name = "startModule0")
40-
public static boolean start(Context context, String name, int age) {
41-
Intent starter = new Intent(context, Module0Activity.class);
42-
starter.putExtra("name", name);
43-
starter.putExtra("age", age);
44-
context.startActivity(starter);
45-
return true;
46-
}
47-
}
4844

49-
// kotlin
50-
class Module0Activity : Activity() {
51-
52-
companion object {
53-
@BusUtils.Subscribe(name = "startModule0")
54-
fun start(context: Context, name: String, age: Int): Boolean {
55-
val starter = Intent(context, Module0Activity::class.java)
56-
starter.putExtra("name", name)
57-
starter.putExtra("age", age)
58-
context.startActivity(starter)
59-
return true
60-
}
61-
}
62-
}
6345
```
6446

6547
在其他模块通过 `BusUtils.post("startModule0", Context, String, int)` 即可访问到它，一定要注意 `name` 之后的参数顺序和个数一定要和前面声明的函数相一致，其返回值也就是前面函数的返回值：
6648

6749
```java
6850
// java
69-
boolean result = BusUtils.post("startModule0", context, "blankj", 18);
51+
boolean api = BusUtils.post("startModule0", context, "blankj", 18);
7052

7153
// kotlin
7254
val result = BusUtils.post("startModule0", context, "blankj", 18)

0 commit comments

Comments
 (0)