Skip to content

Commit 948a87b

Browse files
BlankjBlankj
committed
see 07/18 log
1 parent be990e0 commit 948a87b

File tree

17 files changed

+1061
-214
lines changed

17 files changed

+1061
-214
lines changed

‎.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,4 @@ before_install:
2121
- yes | $ANDROID_HOME/tools/bin/sdkmanager "build-tools;26.0.2"
2222

2323
script:
24-
- ./gradlew build connectedCheck
24+
- ./gradlew aR

‎CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
* `19/07/18` [add] README of ApiUtils and BusUtils.
12
* `19/07/15` [add] Publish v1.25.0.
23
* `19/07/14` [upd] Bus plugin for use BusUtils. Publish bus plugin v2.0.
34
* `19/07/13` [add] Api plugin for use ApiUtils. Publish api plugin v1.0.

‎art/busutil_vs_eventbus.png

62.1 KB
Loading

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,11 @@ class Config {
3838
// 本地第一次上传插件新的版本需设置 useLocal = true, isApply = false
3939
// 本地上传成功之后 isApply = true 即可应用插件来调试，后续版本更新无需设置 isApply = false
4040
// 发布版本的话把 useLocal = false, isApply = false，发布成功后 isApply = true 即可使用远程库版本
41-
api : new DepConfig(false/*是否本地调试*/, "com.blankj:api-gradle-plugin:1.0", true/*是否使用插件*/),
41+
api : new DepConfig(true/*是否本地调试*/, "com.blankj:api-gradle-plugin:1.0", true/*是否使用插件*/),
4242
bus : new DepConfig(false/*是否本地调试*/, "com.blankj:bus-gradle-plugin:2.0", true/*是否使用插件*/),
4343
],
4444

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

4848
feature : [

‎buildSrc/src/main/groovy/ConfigUtils.groovy

Lines changed: 30 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -59,28 +59,6 @@ class ConfigUtils {
5959
return applyExports
6060
}
6161

62-
static Map<String, DepConfig> getDepConfigByFilter(DepConfigFilter filter) {
63-
return _getDepConfigByFilter("", Config.depConfig, filter)
64-
}
65-
66-
private static _getDepConfigByFilter(String namePrefix, Map map, DepConfigFilter filter) {
67-
def depConfigList = [:]
68-
for (Map.Entry entry : map.entrySet()) {
69-
def (name, value) = [entry.getKey(), entry.getValue()]
70-
if (value instanceof Map) {
71-
namePrefix += (name + '.')
72-
depConfigList.putAll(_getDepConfigByFilter(namePrefix, value, filter))
73-
namePrefix -= (name + '.')
74-
continue
75-
}
76-
def config = value as DepConfig
77-
if (filter == null || filter.accept(namePrefix + name, config)) {
78-
depConfigList.put(namePrefix + name, config)
79-
}
80-
}
81-
return depConfigList
82-
}
83-
8462
static addBuildListener(Gradle gradle) {
8563
gradle.addBuildListener(new ConfigBuildListener())
8664
}
@@ -90,6 +68,9 @@ class ConfigUtils {
9068
private List<TaskInfo> taskInfoList = []
9169
private long startBuildMillis
9270

71+
@Override
72+
void buildStarted(Gradle gradle) {}
73+
9374
@Override
9475
void settingsEvaluated(Settings settings) {
9576
startBuildMillis = System.currentTimeMillis()
@@ -150,9 +131,6 @@ class ConfigUtils {
150131
})
151132
}
152133

153-
@Override
154-
void buildStarted(Gradle gradle) {}
155-
156134
@Override
157135
void buildFinished(BuildResult result) {
158136
GLog.d("buildFinished")
@@ -184,6 +162,9 @@ class ConfigUtils {
184162
* 在 settings.gradle 中 根据 appConfig 和 pkgConfig 来 include 本地模块
185163
*/
186164
private static includeModule(Settings settings) {
165+
if (Config.pkgConfig.isEmpty()) {
166+
Config.depConfig.feature.mock.isApply = false
167+
}
187168
def config = getDepConfigByFilter(new DepConfigFilter() {
188169
@Override
189170
boolean accept(String name, DepConfig config) {
@@ -193,8 +174,8 @@ class ConfigUtils {
193174
config.isApply = false
194175
}
195176
}
196-
if (!Config.pkgConfig.isEmpty()) {
197-
if (name.endsWith('.pkg')) {
177+
if (name.endsWith('.pkg')) {
178+
if (!Config.pkgConfig.isEmpty()) {
198179
def pkgName = name.substring('feature.'.length(), name.length() - 4)
199180
if (!Config.pkgConfig.contains(pkgName)) {
200181
config.isApply = false
@@ -247,6 +228,28 @@ class ConfigUtils {
247228
}
248229
}
249230

231+
static Map<String, DepConfig> getDepConfigByFilter(DepConfigFilter filter) {
232+
return _getDepConfigByFilter("", Config.depConfig, filter)
233+
}
234+
235+
private static _getDepConfigByFilter(String namePrefix, Map map, DepConfigFilter filter) {
236+
def depConfigList = [:]
237+
for (Map.Entry entry : map.entrySet()) {
238+
def (name, value) = [entry.getKey(), entry.getValue()]
239+
if (value instanceof Map) {
240+
namePrefix += (name + '.')
241+
depConfigList.putAll(_getDepConfigByFilter(namePrefix, value, filter))
242+
namePrefix -= (name + '.')
243+
continue
244+
}
245+
def config = value as DepConfig
246+
if (filter == null || filter.accept(namePrefix + name, config)) {
247+
depConfigList.put(namePrefix + name, config)
248+
}
249+
}
250+
return depConfigList
251+
}
252+
250253
interface DepConfigFilter {
251254
boolean accept(String name, DepConfig config);
252255
}

‎lib/common/src/main/java/com/blankj/common/CommonTitleActivity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public void setRootLayout(@LayoutRes int layoutId) {
5050
mViewStub = findViewById(R.id.baseTitleStubNoScroll);
5151
}
5252
mViewStub.setVisibility(View.VISIBLE);
53-
baseTitleContentView = findViewById(R.id.baseTitleContentView);
53+
baseTitleContentView = findViewById(R.id.commonTitleContentView);
5454
LayoutInflater.from(this).inflate(layoutId, baseTitleContentView);
5555
}
5656
setTitleBar();

‎lib/common/src/main/res/layout/common_activity_title_stub_no_scroll.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
3-
android:id="@+id/baseTitleContentView"
3+
android:id="@+id/commonTitleContentView"
44
android:layout_width="match_parent"
55
android:layout_height="match_parent" />

‎lib/common/src/main/res/layout/common_activity_title_stub_scroll.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<android.support.v4.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
3-
android:id="@+id/baseTitleNsv"
3+
android:id="@+id/commonTitleNsv"
44
android:layout_width="match_parent"
55
android:layout_height="match_parent"
66
android:fillViewport="true">
77

88
<FrameLayout
9-
android:id="@+id/baseTitleContentView"
9+
android:id="@+id/commonTitleContentView"
1010
android:layout_width="match_parent"
1111
android:layout_height="match_parent" />
1212

‎lib/utilcode/README-API.md

Lines changed: 0 additions & 76 deletions
This file was deleted.

‎lib/utilcode/README-BUS.md

Lines changed: 0 additions & 94 deletions
This file was deleted.

‎lib/utilcode/README-CN.md

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,11 @@ pt2Px : pt 转 px
4141
px2Pt : px 转 pt
4242
```
4343

44+
* ### Api 相关 -> [ApiUtils.java][api.java] -> [README][api.readme]
45+
```
46+
getApi: 获取 api 的实例
47+
```
48+
4449
* ### App 相关 -> [AppUtils.java][app.java] -> [Demo][app.demo]
4550
```
4651
registerAppStatusChangedListener : 注册 App 前后台切换监听器
@@ -984,6 +989,9 @@ getComments : 获取压缩文件中的注释链表
984989
[adaptScreen.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/lib/utilcode/src/main/java/com/blankj/utilcode/util/AdaptScreenUtils.java
985990
[adaptScreen.demo]: https://github.com/Blankj/AndroidUtilCode/blob/master/feature/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/adaptScreen/AdaptScreenActivity.kt
986991

992+
[api.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/lib/utilcode/src/main/java/com/blankj/utilcode/util/ApiUtils.java
993+
[api.readme]: https://github.com/Blankj/AndroidUtilCode/blob/master/plugin/api-gradle-plugin
994+
987995
[app.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/lib/utilcode/src/main/java/com/blankj/utilcode/util/AppUtils.java
988996
[app.demo]: https://github.com/Blankj/AndroidUtilCode/blob/master/feature/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/app/AppActivity.kt
989997

@@ -994,7 +1002,7 @@ getComments : 获取压缩文件中的注释链表
9941002
[brightness.demo]: https://github.com/Blankj/AndroidUtilCode/blob/master/feature/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/brightness/BrightnessActivity.kt
9951003

9961004
[bus.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/lib/utilcode/src/main/java/com/blankj/utilcode/util/BusUtils.java
997-
[bus.readme]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/README-STATIC-BUS.md
1005+
[bus.readme]: https://github.com/Blankj/AndroidUtilCode/blob/master/plugin/bus-gradle-plugin
9981006

9991007
[cacheDiskStatic.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/lib/utilcode/src/main/java/com/blankj/utilcode/util/CacheDiskStaticUtils.java
10001008
[cacheDiskStatic.test]: https://github.com/Blankj/AndroidUtilCode/blob/master/lib/utilcode/src/test/java/com/blankj/utilcode/util/CacheDiskStaticUtilsTest.java

‎lib/utilcode/README.md

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,11 @@ pt2Px
4141
px2Pt
4242
```
4343

44+
* ### About Api -> [ApiUtils.java][api.java] -> [README][api.readme]
45+
```
46+
getApi
47+
```
48+
4449
* ### About App -> [AppUtils.java][app.java] -> [Demo][app.demo]
4550
```
4651
registerAppStatusChangedListener
@@ -984,6 +989,9 @@ getComments
984989
[adaptScreen.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/lib/utilcode/src/main/java/com/blankj/utilcode/util/AdaptScreenUtils.java
985990
[adaptScreen.demo]: https://github.com/Blankj/AndroidUtilCode/blob/master/feature/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/adaptScreen/AdaptScreenActivity.kt
986991

992+
[api.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/lib/utilcode/src/main/java/com/blankj/utilcode/util/ApiUtils.java
993+
[api.readme]: https://github.com/Blankj/AndroidUtilCode/blob/master/plugin/api-gradle-plugin
994+
987995
[app.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/lib/utilcode/src/main/java/com/blankj/utilcode/util/AppUtils.java
988996
[app.demo]: https://github.com/Blankj/AndroidUtilCode/blob/master/feature/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/app/AppActivity.kt
989997

@@ -994,7 +1002,7 @@ getComments
9941002
[brightness.demo]: https://github.com/Blankj/AndroidUtilCode/blob/master/feature/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/brightness/BrightnessActivity.kt
9951003

9961004
[bus.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/lib/utilcode/src/main/java/com/blankj/utilcode/util/BusUtils.java
997-
[bus.readme]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/README-STATIC-BUS.md
1005+
[bus.readme]: https://github.com/Blankj/AndroidUtilCode/blob/master/plugin/bus-gradle-plugin
9981006

9991007
[cacheDiskStatic.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/lib/utilcode/src/main/java/com/blankj/utilcode/util/CacheDiskStaticUtils.java
10001008
[cacheDiskStatic.test]: https://github.com/Blankj/AndroidUtilCode/blob/master/lib/utilcode/src/test/java/com/blankj/utilcode/util/CacheDiskStaticUtilsTest.java

0 commit comments

Comments
 (0)