Skip to content

Commit 408303f

Browse files
BlankjBlankj
committed
see 11/07 log
1 parent 2ca2c82 commit 408303f

File tree

276 files changed

+8682
-6604
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

276 files changed

+8682
-6604
lines changed

‎CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
* `19/10/30` [add] Publish bus plugin v2.3. Publish api plugin v1.1.
2+
* `19/10/24` [upd] Demo's UI.
3+
* `19/10/22` [add] NotificationUtils.
4+
* `19/10/20` [add] UiMessageUtils.
5+
* `19/09/20` [add] ShadowUtils.
16
* `19/08/27` [add] DebugUtils.
27
* `19/08/26` [fix] PermissionUtils NPE.
38
* `19/08/25` [upd] ImageUtils#getImageType. [add] LogUtils#getLogFiles. Publish v1.25.9.

‎README-CN.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242

4343
## 打个小广告
4444

45-
欢迎加入我的知识星球「**[基你太美](https://t.zsxq.com/FmeqfYF)**」，我会在星球中分享 [AucFrame](https://blankj.com/2019/07/22/auc-frame/) 框架、大厂面经、[AndroidUtilCode](https://github.com/Blankj/AndroidUtilCode) 更详尽的说明...一切我所了解的知识，你可以通过支付进入我的星球「**[基你太美](https://t.zsxq.com/FmeqfYF)**」进行体验，加入后优先观看星球中精华的部分，如果觉得星球的内容对自身没有收益，你可以自行申请退款退出星球，也没必要加我好友；**如果你已确定要留在我的星球，可以通过扫描如下二维码（备注：基你太美）加我个人微信，发送给我你的星球 ID，方便我后续拉你进群(PS：进得越早价格越便宜)。**
45+
欢迎加入我的知识星球「**[基你太美](https://t.zsxq.com/FmeqfYF)**」，我会在星球中分享 [AucFrame](https://blankj.com/2019/07/22/auc-frame/) 框架、大厂面经、[AndroidUtilCode](https://github.com/Blankj/AndroidUtilCode) 更详尽的说明...一切我所了解的知识，你可以通过支付进入我的星球「**[基你太美](https://t.zsxq.com/FmeqfYF)**」进行体验，加入后优先观看星球中精华的部分，如果觉得星球的内容对自身没有收益，你可以自行申请退款退出星球，也没必要加我好友；**如果你已确定要留在我的星球，可以通过扫描如下二维码（备注：基你太美+你的星球昵称）加我个人微信，方便我后续拉你进群(PS：进得越早价格越便宜)。**
4646

4747
![我的二维码](https://raw.githubusercontent.com/Blankj/AndroidUtilCode/master/art/wechat.png)
4848

‎buildApp.gradle

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,14 @@ apply {
1313
configSigning()
1414
configApkName()
1515

16+
bus {
17+
onlyScanLibRegex = '^([:]|(com\\.blankj)).+$'
18+
}
19+
20+
api {
21+
onlyScanLibRegex = '^([:]|(com\\.blankj)).+$'
22+
}
23+
1624
android {
1725
compileSdkVersion Config.compileSdkVersion
1826
defaultConfig {
@@ -58,6 +66,9 @@ dependencies {
5866
debugImplementation Config.depConfig.leakcanary.support_fragment.dep
5967
releaseImplementation Config.depConfig.leakcanary.android_no_op.dep
6068

69+
debugImplementation Config.depConfig.lib.utildebug.dep
70+
releaseImplementation Config.depConfig.lib.utildebug_no_op.dep
71+
6172
debugImplementation 'com.didichuxing.doraemonkit:doraemonkit:1.1.8'
6273
releaseImplementation 'com.didichuxing.doraemonkit:doraemonkit-no-op:1.1.8'
6374

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

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ class Config {
1515
static minSdkVersion = 16
1616
static targetSdkVersion = 28
1717
static versionCode = 1_025_010
18-
static versionName = '1.25.10-alpha3'// E.g. 1.9.72 => 1,009,072
18+
static versionName = '1.25.10-alpha5'// E.g. 1.9.72 => 1,009,072
1919

2020
// lib version
2121
static kotlin_version = '1.3.10'
@@ -38,8 +38,8 @@ 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/*是否使用插件*/),
42-
bus : new DepConfig(false/*是否本地调试*/, "com.blankj:bus-gradle-plugin:2.1", true/*是否使用插件*/),
41+
api : new DepConfig(false/*是否本地调试*/, "com.blankj:api-gradle-plugin:1.1", true/*是否使用插件*/),
42+
bus : new DepConfig(false/*是否本地调试*/, "com.blankj:bus-gradle-plugin:2.3", true/*是否使用插件*/),
4343
],
4444

4545
api_gradle_plugin: new DepConfig(":plugin:api-gradle-plugin", false),
@@ -71,11 +71,13 @@ class Config {
7171
],
7272

7373
lib : [
74-
base : new DepConfig(":lib:base"),
75-
common : new DepConfig(":lib:common"),
76-
subutil : new DepConfig(":lib:subutil"),
77-
utilcode : new DepConfig(true/*是否本地调试*/, ":lib:utilcode", "com.blankj:utilcode:$versionName"),
78-
utildebug: new DepConfig(true/*是否本地调试*/, ":lib:utildebug", "com.blankj:utildebug:$versionName"),
74+
base : new DepConfig(":lib:base"),
75+
common : new DepConfig(":lib:common"),
76+
subutil : new DepConfig(":lib:subutil"),
77+
utilcode : new DepConfig(true/*是否本地调试*/, ":lib:utilcode", "com.blankj:utilcode:$versionName"),
78+
79+
utildebug : new DepConfig(true/*是否本地调试*/, ":lib:utildebug", "com.blankj:utildebug:$versionName"),
80+
utildebug_no_op: new DepConfig(true/*是否本地调试*/, ":lib:utildebug-no-op", "com.blankj:utildebug-no-op:$versionName"),
7981
],
8082

8183
support : [
@@ -96,7 +98,7 @@ class Config {
9698
free_proguard : new DepConfig("com.blankj:free-proguard:1.0.1"),
9799
swipe_panel : new DepConfig("com.blankj:swipe-panel:1.2"),
98100

99-
gson : new DepConfig("com.google.code.gson:gson:2.8.2"),
101+
gson : new DepConfig("com.google.code.gson:gson:2.8.6"),
100102
glide : new DepConfig("com.github.bumptech.glide:glide:4.7.1"),
101103
retrofit : new DepConfig("com.squareup.retrofit2:retrofit:2.4.0"),
102104
commons_io : new DepConfig("commons-io:commons-io:2.6"),

‎feature/launcher/app/src/main/java/com/blankj/launcher/app/LauncherApp.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import android.content.Context;
44

55
import com.blankj.common.CommonApplication;
6+
import com.blankj.utilcode.util.ResourceUtils;
67

78
/**
89
* <pre>

‎feature/main/pkg/src/main/java/com/blankj/main/pkg/MainActivity.kt

Lines changed: 26 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,15 @@ import android.graphics.Color
44
import android.os.Bundle
55
import android.support.v7.app.ActionBarDrawerToggle
66
import android.view.View
7-
import android.widget.ImageView
8-
import com.blankj.common.CommonDrawerActivity
7+
import com.blankj.common.activity.CommonActivity
8+
import com.blankj.common.item.CommonItem
9+
import com.blankj.common.item.CommonItemClick
910
import com.blankj.subutil.export.api.SubUtilApi
10-
import com.blankj.utilcode.constant.PermissionConstants
1111
import com.blankj.utilcode.export.api.UtilCodeApi
12-
import com.blankj.utilcode.util.*
12+
import com.blankj.utilcode.util.ActivityUtils
13+
import com.blankj.utilcode.util.ApiUtils
14+
import com.blankj.utilcode.util.BarUtils
15+
import com.blankj.utilcode.util.CollectionUtils
1316
import kotlinx.android.synthetic.main.activity_main.*
1417

1518

@@ -21,59 +24,43 @@ import kotlinx.android.synthetic.main.activity_main.*
2124
* desc : MainActivity
2225
* ```
2326
*/
24-
class MainActivity : CommonDrawerActivity() {
27+
class MainActivity : CommonActivity() {
2528

26-
override fun initData(bundle: Bundle?) {
27-
28-
PermissionUtils.permission(PermissionConstants.CALENDAR)
29-
.callback(object : PermissionUtils.SimpleCallback {
30-
override fun onGranted() {
31-
LogUtils.e()
32-
}
29+
override fun isSwipeBack(): Boolean {
30+
return false
31+
}
3332

34-
override fun onDenied() {
35-
LogUtils.e()
36-
}
37-
})
33+
override fun bindDrawer(): Boolean {
34+
return true
3835
}
3936

4037
override fun bindLayout(): Int {
4138
return R.layout.activity_main
4239
}
4340

44-
private var view: ImageView? = null
45-
4641
override fun initView(savedInstanceState: Bundle?, contentView: View?) {
42+
super.initView(savedInstanceState, contentView)
43+
setCommonItems(mainRv, CollectionUtils.newArrayList<CommonItem<*>>(
44+
CommonItemClick(R.string.core_util, true) {
45+
ApiUtils.getApi(UtilCodeApi::class.java).startUtilCodeActivity(this)
46+
},
47+
CommonItemClick(R.string.sub_util, true) {
48+
ApiUtils.getApi(SubUtilApi::class.java).startSubUtilActivity(this)
49+
}
50+
))
51+
4752
launcherMainCtl.setExpandedTitleColor(Color.TRANSPARENT)
4853
setSupportActionBar(launcherMainToolbar)
4954
val toggle = ActionBarDrawerToggle(this,
50-
mBaseDrawerRootLayout,
55+
drawerView.mBaseDrawerRootLayout,
5156
launcherMainToolbar,
5257
R.string.navigation_drawer_open,
5358
R.string.navigation_drawer_close)
54-
mBaseDrawerRootLayout.addDrawerListener(toggle)
59+
drawerView.mBaseDrawerRootLayout.addDrawerListener(toggle)
5560
toggle.syncState()
5661

57-
BarUtils.setStatusBarColor4Drawer(mBaseDrawerRootLayout, launcherMainFakeStatusBar, Color.TRANSPARENT, false)
62+
BarUtils.setStatusBarColor4Drawer(drawerView.mBaseDrawerRootLayout, launcherMainFakeStatusBar, Color.TRANSPARENT, false)
5863
BarUtils.addMarginTopEqualStatusBarHeight(launcherMainToolbar)
59-
60-
applyDebouncingClickListener(
61-
launcherMainCoreUtilBtn,
62-
launcherMainSubUtilBtn
63-
)
64-
}
65-
66-
override fun doBusiness() {}
67-
68-
override fun onDebouncingClick(view: View) {
69-
when (view.id) {
70-
R.id.launcherMainCoreUtilBtn -> {
71-
ApiUtils.getApi(UtilCodeApi::class.java).startUtilCodeActivity(this)
72-
}
73-
R.id.launcherMainSubUtilBtn -> {
74-
ApiUtils.getApi(SubUtilApi::class.java).startSubUtilActivity(this)
75-
}
76-
}
7764
}
7865

7966
override fun onBackPressed() {

‎feature/main/pkg/src/main/java/com/blankj/main/pkg/SplashActivity.kt

Lines changed: 2 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,7 @@
11
package com.blankj.main.pkg
22

3-
import android.os.Bundle
4-
import android.view.View
5-
import com.blankj.common.CommonBackActivity
3+
import com.blankj.common.activity.CommonActivity
64

7-
class SplashActivity : CommonBackActivity() {
8-
override fun isSwipeBack(): Boolean {
9-
TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
10-
}
5+
class SplashActivity : CommonActivity() {
116

12-
override fun initData(bundle: Bundle?) {
13-
TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
14-
}
15-
16-
override fun bindLayout(): Int {
17-
TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
18-
}
19-
20-
override fun initView(savedInstanceState: Bundle?, contentView: View?) {
21-
TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
22-
}
23-
24-
override fun doBusiness() {
25-
TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
26-
}
27-
28-
override fun onDebouncingClick(view: View) {
29-
TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
30-
}
317
}

‎feature/main/pkg/src/main/res/layout/activity_main.xml

Lines changed: 3 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -40,33 +40,10 @@
4040
android:layout_width="match_parent"
4141
android:layout_height="0dp" />
4242

43-
<android.support.v4.widget.NestedScrollView
43+
<android.support.v7.widget.RecyclerView
44+
android:id="@+id/mainRv"
4445
android:layout_width="match_parent"
4546
android:layout_height="match_parent"
46-
app:layout_behavior="@string/appbar_scrolling_view_behavior">
47+
app:layout_behavior="@string/appbar_scrolling_view_behavior" />
4748

48-
<LinearLayout
49-
android:layout_width="match_parent"
50-
android:layout_height="wrap_content"
51-
android:gravity="center_horizontal"
52-
android:orientation="vertical"
53-
android:paddingLeft="@dimen/spacing_16"
54-
android:paddingRight="@dimen/spacing_16">
55-
56-
<Button
57-
android:id="@+id/launcherMainCoreUtilBtn"
58-
style="@style/WideBtnStyle"
59-
android:layout_width="match_parent"
60-
android:layout_height="wrap_content"
61-
android:text="@string/core_util" />
62-
63-
<Button
64-
android:id="@+id/launcherMainSubUtilBtn"
65-
style="@style/WideBtnStyle"
66-
android:layout_width="match_parent"
67-
android:layout_height="wrap_content"
68-
android:text="@string/sub_util" />
69-
70-
</LinearLayout>
71-
</android.support.v4.widget.NestedScrollView>
7249
</android.support.design.widget.CoordinatorLayout>

‎feature/subutil/pkg/src/main/java/com/blankj/subutil/pkg/feature/SubUtilActivity.kt

Lines changed: 26 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,18 @@ package com.blankj.subutil.pkg.feature
22

33
import android.content.Context
44
import android.content.Intent
5-
import android.os.Bundle
6-
import android.view.View
7-
import com.blankj.common.CommonTitleActivity
5+
import com.blankj.common.activity.CommonActivity
6+
import com.blankj.common.activity.CommonActivityItemsView
7+
import com.blankj.common.activity.CommonActivityTitleView
8+
import com.blankj.common.item.CommonItem
9+
import com.blankj.common.item.CommonItemClick
810
import com.blankj.subutil.pkg.R
911
import com.blankj.subutil.pkg.feature.appStore.AppStoreActivity
1012
import com.blankj.subutil.pkg.feature.country.CountryActivity
1113
import com.blankj.subutil.pkg.feature.dangerous.DangerousActivity
1214
import com.blankj.subutil.pkg.feature.location.LocationActivity
1315
import com.blankj.subutil.pkg.feature.pinyin.PinyinActivity
14-
import kotlinx.android.synthetic.main.activity_util_sub.*
16+
import com.blankj.utilcode.util.CollectionUtils
1517

1618
/**
1719
* ```
@@ -21,7 +23,7 @@ import kotlinx.android.synthetic.main.activity_util_sub.*
2123
* desc : MainActivity
2224
* ```
2325
*/
24-
class SubUtilActivity : CommonTitleActivity() {
26+
class SubUtilActivity : CommonActivity() {
2527

2628
companion object {
2729
fun start(context: Context) {
@@ -30,35 +32,28 @@ class SubUtilActivity : CommonTitleActivity() {
3032
}
3133
}
3234

33-
override fun bindTitle(): CharSequence {
34-
return getString(R.string.sub_util)
35-
}
36-
37-
override fun initData(bundle: Bundle?) {}
3835

39-
override fun bindLayout(): Int {
40-
return R.layout.activity_util_sub
36+
override fun bindTitleRes(): Int {
37+
return R.string.sub_util
4138
}
4239

43-
override fun initView(savedInstanceState: Bundle?, contentView: View?) {
44-
applyDebouncingClickListener(
45-
subUtilAppStoreBtn,
46-
subUtilCountryBtn,
47-
subUtilDangerousBtn,
48-
subUtilLocationBtn,
49-
subUtilPinyinBtn
40+
override fun bindItems(): List<CommonItem<*>> {
41+
return CollectionUtils.newArrayList(
42+
CommonItemClick(R.string.demo_app_store, true) {
43+
AppStoreActivity.start(this)
44+
},
45+
CommonItemClick(R.string.demo_country, true) {
46+
CountryActivity.start(this)
47+
},
48+
CommonItemClick(R.string.demo_dangerous, true) {
49+
DangerousActivity.start(this)
50+
},
51+
CommonItemClick(R.string.demo_location, true) {
52+
LocationActivity.start(this)
53+
},
54+
CommonItemClick(R.string.demo_pinyin, true) {
55+
PinyinActivity.start(this)
56+
}
5057
)
5158
}
52-
53-
override fun doBusiness() {}
54-
55-
override fun onDebouncingClick(view: View) {
56-
when (view.id) {
57-
R.id.subUtilAppStoreBtn -> AppStoreActivity.start(this)
58-
R.id.subUtilCountryBtn -> CountryActivity.start(this)
59-
R.id.subUtilDangerousBtn -> DangerousActivity.start(this)
60-
R.id.subUtilLocationBtn -> LocationActivity.start(this)
61-
R.id.subUtilPinyinBtn -> PinyinActivity.start(this)
62-
}
63-
}
6459
}

0 commit comments

Comments
 (0)