Skip to content

Commit 4625d7e

Browse files
BlankjBlankj
committed
see 06/20 log
1 parent 3bc9604 commit 4625d7e

File tree

11 files changed

+60
-47
lines changed

11 files changed

+60
-47
lines changed

‎CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
* `19/06/20` [fix] BusUtils' permission. Publish v1.24.4.
12
* `19/06/19` [fix] UriUtils. Publish v1.24.3.
23
* `19/06/18` [add] ClickUtils, ViewUtils.
34
* `19/06/07` [fix] LogUtils file name contains ':'. Publish v1.24.2.

‎README-CN.md

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

4242
[logo]: https://raw.githubusercontent.com/Blankj/AndroidUtilCode/master/art/logo.png
4343

44-
[aucSvg]: https://img.shields.io/badge/AndroidUtilCode-v1.24.3-brightgreen.svg
44+
[aucSvg]: https://img.shields.io/badge/AndroidUtilCode-v1.24.4-brightgreen.svg
4545
[auc]: https://github.com/Blankj/AndroidUtilCode
4646

4747
[apiSvg]: https://img.shields.io/badge/API-14+-brightgreen.svg

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ If this project helps you a lot and you want to support the project's developmen
4141

4242
[logo]: https://raw.githubusercontent.com/Blankj/AndroidUtilCode/master/art/logo.png
4343

44-
[aucSvg]: https://img.shields.io/badge/AndroidUtilCode-v1.24.3-brightgreen.svg
44+
[aucSvg]: https://img.shields.io/badge/AndroidUtilCode-v1.24.4-brightgreen.svg
4545
[auc]: https://github.com/Blankj/AndroidUtilCode
4646

4747
[apiSvg]: https://img.shields.io/badge/API-14+-brightgreen.svg

‎gradle/config/config.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ gradle.ext {
88
compileSdkVersion = 27
99
minSdkVersion = 14
1010
targetSdkVersion = 27
11-
versionCode = 1_024_003
12-
versionName = '1.24.3'// E.g. 1.9.72 => 1,009,072
11+
versionCode = 1_024_004
12+
versionName = '1.24.4'// E.g. 1.9.72 => 1,009,072
1313

1414
// lib version
1515
kotlin_version = '1.3.10'

‎lib/base/src/main/java/com/blankj/lib/base/rv/BaseAdapter.java

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
import android.support.annotation.NonNull;
55
import android.support.v7.widget.RecyclerView;
66
import android.view.LayoutInflater;
7-
import android.view.View;
87
import android.view.ViewGroup;
98

109
import java.util.List;
@@ -39,19 +38,8 @@ public final int getItemViewType(int position) {
3938
@NonNull
4039
@Override
4140
public BaseViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
42-
if (mContext == null) {
43-
mContext = parent.getContext();
44-
mInflater = LayoutInflater.from(mContext);
45-
}
46-
int layoutByType = BaseCell.getLayoutByType(viewType);
47-
if (layoutByType != -1) {
48-
return new BaseViewHolder(mInflater.inflate(layoutByType, parent, false));
49-
}
50-
View viewByType = BaseCell.getViewByType(viewType);
51-
if (viewByType != null) {
52-
return new BaseViewHolder(viewByType);
53-
}
54-
throw new RuntimeException("onCreateViewHolder: get holder from view type failed.");
41+
BaseViewHolder baseViewHolder = Cell.onCreateViewHolder(parent, viewType);
42+
return baseViewHolder;
5543
}
5644

5745
@Override
@@ -61,6 +49,7 @@ public final void onBindViewHolder(@NonNull BaseViewHolder holder, int position)
6149

6250
@Override
6351
public int getItemCount() {
52+
if (mData == null) return 0;
6453
return mData.size();
6554
}
6655

‎lib/base/src/main/java/com/blankj/lib/base/rv/BaseCell.java

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@
33
import android.support.annotation.NonNull;
44
import android.util.SparseArray;
55
import android.util.SparseIntArray;
6+
import android.view.LayoutInflater;
67
import android.view.View;
8+
import android.view.ViewGroup;
79

810
/**
911
* <pre>
@@ -42,4 +44,16 @@ public BaseCell(View view) {
4244
viewType = getClass().hashCode();
4345
VIEW_SPARSE_ARRAY.put(viewType, view);
4446
}
47+
48+
public static BaseViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
49+
int layoutByType = getLayoutByType(viewType);
50+
if (layoutByType != -1) {
51+
return new BaseViewHolder(LayoutInflater.from(parent.getContext()).inflate(layoutByType, parent, false));
52+
}
53+
View viewByType = getViewByType(viewType);
54+
if (viewByType != null) {
55+
return new BaseViewHolder(viewByType);
56+
}
57+
throw new RuntimeException("onCreateViewHolder: get holder from view type failed.");
58+
}
4559
}

‎utilcode/README-CN.md

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22

33
Gradle:
44
```groovy
5-
implementation 'com.blankj:utilcode:1.24.3'
5+
implementation 'com.blankj:utilcode:1.24.4'
66
77
// if u use AndroidX, use the following
8-
implementation 'com.blankj:utilcodex:1.24.3'
8+
implementation 'com.blankj:utilcodex:1.24.4'
99
```
1010

1111

@@ -41,11 +41,6 @@ pt2Px : pt 转 px
4141
px2Pt : px 转 pt
4242
```
4343

44-
* ### AntiShake 相关 -> [AntiShakeUtils.java][antiShake.java]
45-
```
46-
isValid: 是否有效
47-
```
48-
4944
* ### App 相关 -> [AppUtils.java][app.java] -> [Demo][app.demo]
5045
```
5146
registerAppStatusChangedListener : 注册 App 前后台切换监听器
@@ -976,8 +971,6 @@ getComments : 获取压缩文件中的注释链表
976971
[adaptScreen.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/lib/src/main/java/com/blankj/utilcode/util/AdaptScreenUtils.java
977972
[adaptScreen.demo]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/adaptScreen/AdaptScreenActivity.kt
978973

979-
[antiShake.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/lib/src/main/java/com/blankj/utilcode/util/AntiShakeUtils.java
980-
981974
[app.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/lib/src/main/java/com/blankj/utilcode/util/AppUtils.java
982975
[app.demo]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/app/AppActivity.kt
983976

‎utilcode/README-STATIC-BUS.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ apply plugin: "com.blankj.bus"
2727
给 base 模块添加 [AndroidUtilCode](https://github.com/Blankj/AndroidUtilCode) 依赖：
2828

2929
```groovy
30-
api "com.blankj:utilcode:1.24.3"
30+
api "com.blankj:utilcode:1.24.4"
3131
```
3232

3333
比如 module0 中存在的 `Module0Activity.java`，我们通常都是在它内部写一个 `start` 函数来启动它，现在我们给它添加 `@BusUtils.Subscribe` 注解，并给注解的 `name` 赋唯一值，要注意，函数务必要 `public static` 哦：

‎utilcode/README.md

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22

33
Gradle:
44
```groovy
5-
implementation 'com.blankj:utilcode:1.24.3'
5+
implementation 'com.blankj:utilcode:1.24.4'
66
77
// if u use AndroidX, use the following
8-
implementation 'com.blankj:utilcodex:1.24.3'
8+
implementation 'com.blankj:utilcodex:1.24.4'
99
```
1010

1111

@@ -41,11 +41,6 @@ pt2Px
4141
px2Pt
4242
```
4343

44-
* ### About AntiShake -> [AntiShakeUtils.java][antiShake.java]
45-
```
46-
isValid
47-
```
48-
4944
* ### About App -> [AppUtils.java][app.java] -> [Demo][app.demo]
5045
```
5146
registerAppStatusChangedListener
@@ -976,8 +971,6 @@ getComments
976971
[adaptScreen.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/lib/src/main/java/com/blankj/utilcode/util/AdaptScreenUtils.java
977972
[adaptScreen.demo]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/adaptScreen/AdaptScreenActivity.kt
978973

979-
[antiShake.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/lib/src/main/java/com/blankj/utilcode/util/AntiShakeUtils.java
980-
981974
[app.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/lib/src/main/java/com/blankj/utilcode/util/AppUtils.java
982975
[app.demo]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/app/AppActivity.kt
983976

‎utilcode/lib/src/main/AndroidManifest.xml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
22
package="com.blankj.utilcode">
33

4-
<permission android:name="com.blankj.utilcode.util.bus" />
5-
64
<application>
75

86
<activity
@@ -23,9 +21,7 @@
2321
android:resource="@xml/util_code_provider_paths" />
2422
</provider>
2523

26-
<service
27-
android:name="com.blankj.utilcode.util.BusUtils$ServerService"
28-
android:permission="com.blankj.utilcode.util.bus">
24+
<service android:name="com.blankj.utilcode.util.BusUtils$ServerService">
2925
<intent-filter>
3026
<action android:name="${applicationId}.messenger" />
3127
</intent-filter>

‎utilcode/pkg/src/main/res/layout/activity_image.xml

Lines changed: 32 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,33 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<android.support.v7.widget.RecyclerView xmlns:android="http://schemas.android.com/apk/res/android"
3-
android:id="@+id/imageRv"
4-
android:layout_width="match_parent"
5-
android:layout_height="match_parent"
6-
android:padding="@dimen/spacing_16" />
2+
<!--<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"-->
3+
<!--android:layout_width="match_parent"-->
4+
<!--android:layout_height="match_parent">-->
5+
6+
<!--<LinearLayout-->
7+
<!--android:layout_width="match_parent"-->
8+
<!--android:layout_height="wrap_content"-->
9+
<!--android:orientation="vertical">-->
10+
11+
<android.support.v7.widget.RecyclerView
12+
xmlns:android="http://schemas.android.com/apk/res/android"
13+
android:id="@+id/imageRv"
14+
android:layout_width="match_parent"
15+
android:layout_height="wrap_content"
16+
android:fadeScrollbars="false"
17+
android:padding="@dimen/spacing_16"
18+
android:scrollbarSize="6dp"
19+
android:scrollbarStyle="outsideOverlay"
20+
android:scrollbarThumbVertical="@color/light_black"
21+
android:scrollbars="vertical"
22+
android:translationZ="-8dp" />
23+
24+
<!--<LinearLayout-->
25+
<!--android:layout_width="match_parent"-->
26+
<!--android:layout_height="40dp"-->
27+
<!--android:background="@color/light_black">-->
28+
29+
<!--</LinearLayout>-->
30+
31+
<!--</LinearLayout>-->
32+
33+
<!--</ScrollView>-->

0 commit comments

Comments
 (0)