Skip to content

Commit 434be9d

Browse files
committed
Merge branch 'master' into dev
2 parents d24d72d + 557170e commit 434be9d

File tree

2 files changed

+23
-19
lines changed

2 files changed

+23
-19
lines changed

README.md

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<p align="center">
2-
<img src="https://github.com/ray00178/RZAlbum-Java/blob/master/RZAlbum_Logo.png" alt="RZAlbum" width="450" height="450" />
2+
<img src="https://github.com/ray00178/RZAlbum-Java/blob/master/doc/RZAlbum_Logo.png" alt="RZAlbum" width="450" height="450" />
33
</p>
44

5-
![](https://github.com/ray00178/RZAlbum-Java/blob/master/rzalbum_platform.svg) ![](https://github.com/ray00178/RZAlbum-Java/blob/master/rzalbum_version.svg) ![](https://github.com/ray00178/RZAlbum-Java/blob/master/rzalbum_license.svg)
5+
![](https://github.com/ray00178/RZAlbum-Java/blob/master/doc/rzalbum_platform.svg) ![](https://github.com/ray00178/RZAlbum-Java/blob/master/doc/rzalbum_version.svg) ![](https://github.com/ray00178/RZAlbum-Java/blob/master/doc/rzalbum_license.svg)
66

77
The RZAlbum for android to select the photo library. And usage:<br/>
88
* Support Single choice、Multiple choice、Preview、Folder switch and take pictures.  
@@ -13,19 +13,19 @@ The RZAlbum for android to select the photo library. And usage:<br/>
1313
* For __Android7.0 or later, the camera function through the FileProvider do adaptation processing.__<br/>
1414

1515
Screenshots <br/><br/>
16-
![](https://github.com/ray00178/RZAlbum-Java/blob/master/screenshots.png)
16+
![](https://github.com/ray00178/RZAlbum-Java/blob/master/doc/screenshots.png)
1717
Gradle
1818
====
1919
```java
20-
compile 'com.rayzhang.android:rzalbum:1.7.0'
20+
implementation 'com.rayzhang.android:rzalbum:1.7.1'
2121
```
2222
Maven
2323
====
2424
```java
2525
<dependency>
2626
<groupId>com.rayzhang.android</groupId>
2727
<artifactId>rzalbum</artifactId>
28-
 <version>1.7.0</version>
28+
 <version>1.7.1</version>
2929
<type>pom</type>
3030
</dependency>
3131
```
@@ -117,11 +117,11 @@ Notice
117117
====
118118
1.Due to support Material Design style and handle the image cache, So the library references the following categories.
119119
```xml
120-
compile 'com.android.support:design:27.1.1'
121-
compile 'com.android.support:recyclerview-v7:27.1.1'
120+
compile 'com.android.support:design:28.0.0'
121+
compile 'com.android.support:recyclerview-v7:28.0.0'
122122
// Glide
123-
compile 'com.github.bumptech.glide:glide:4.7.1'
124-
annotationProcessor 'com.github.bumptech.glide:compiler:4.7.1'
123+
compile 'com.github.bumptech.glide:glide:4.8.0'
124+
annotationProcessor 'com.github.bumptech.glide:compiler:4.8.0'
125125
```
126126
2.If u build project then see error log like this.
127127
```xml
@@ -150,6 +150,8 @@ Notice
150150
```
151151
Update Log
152152
====
153+
- **2019-01-21 Version 1.7.1**
154+
- update【android support library -> 28.0.0】&【Glide -> 4.8.0】
153155
- **2018-08-12 Version 1.7.0**
154156
- add setAllFolderName() & showGif() function
155157
- add AlbumPhoto class

README_zh.md

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<p align="center">
2-
<img src="https://github.com/ray00178/RZAlbum-Java/blob/master/RZAlbum_Logo.png" alt="RZAlbum" width="450" height="450" />
2+
<img src="https://github.com/ray00178/RZAlbum-Java/blob/master/doc/RZAlbum_Logo.png" alt="RZAlbum" width="450" height="450" />
33
</p>
44

5-
![](https://github.com/ray00178/RZAlbum-Java/blob/master/rzalbum_platform.svg) ![](https://github.com/ray00178/RZAlbum-Java/blob/master/rzalbum_version.svg) ![](https://github.com/ray00178/RZAlbum-Java/blob/master/rzalbum_license.svg)
5+
![](https://github.com/ray00178/RZAlbum-Java/blob/master/doc/rzalbum_platform.svg) ![](https://github.com/ray00178/RZAlbum-Java/blob/master/doc/rzalbum_version.svg) ![](https://github.com/ray00178/RZAlbum-Java/blob/master/doc/rzalbum_license.svg)
66

77
RZAlbum為Android而生的照片選擇庫,相關功能如下:<br/>
88
* 可支持單選、複選、預覽、照片文件夾切換及內建拍照
@@ -13,19 +13,19 @@ RZAlbum為Android而生的照片選擇庫,相關功能如下:<br/>
1313
* 對於Android7.0以上,拍照功能透過FileProvider做適配處理<br/>
1414

1515
Screenshots <br/><br/>
16-
![](https://github.com/ray00178/RZAlbum-Java/blob/master/screenshots.png)
16+
![](https://github.com/ray00178/RZAlbum-Java/blob/master/doc/screenshots.png)
1717
Gradle
1818
====
1919
```java
20-
compile 'com.rayzhang.android:rzalbum:1.7.0'
20+
implementation 'com.rayzhang.android:rzalbum:1.7.1'
2121
```
2222
Maven
2323
====
2424
```java
2525
<dependency>
2626
<groupId>com.rayzhang.android</groupId>
2727
<artifactId>rzalbum</artifactId>
28-
 <version>1.7.0</version>
28+
 <version>1.7.1</version>
2929
<type>pom</type>
3030
</dependency>
3131
```
@@ -118,16 +118,16 @@ Notice
118118
====
119119
由於支援Material Design的風格及處理圖片的緩存,故該庫引用下列類別庫
120120
```xml
121-
compile 'com.android.support:design:27.1.1'
122-
compile 'com.android.support:recyclerview-v7:27.1.1'
121+
compile 'com.android.support:design:28.0.0'
122+
compile 'com.android.support:recyclerview-v7:28.0.0'
123123
// Glide
124-
compile 'com.github.bumptech.glide:glide:4.7.1'
125-
annotationProcessor 'com.github.bumptech.glide:compiler:4.7.1'
124+
compile 'com.github.bumptech.glide:glide:4.8.0'
125+
annotationProcessor 'com.github.bumptech.glide:compiler:4.8.0'
126126
```
127127
2.如果在build專案時出現下列類似錯誤的訊息
128128
```xml
129129
Manifest merger failed : Attribute application@label value=(@string/app_name) from
130-
AndroidManifest.xml:21:9-41 is also present at [com.rayzhang.android:rzalbum:1.7.0] AndroidManifest.xml:14:9-44 value=
130+
AndroidManifest.xml:21:9-41 is also present at [com.rayzhang.android:rzalbum:1.7.1] AndroidManifest.xml:14:9-44 value=
131131
(@string/rz_app_name).Suggestion: add 'tools:replace="android:label"' to <application> element at
132132
AndroidManifest.xml:17:5-44:19 to override.
133133
```
@@ -151,6 +151,8 @@ Notice
151151
```
152152
Update Log
153153
====
154+
- **2019-01-21 Version 1.7.1**
155+
- 更新【android support library -> 28.0.0】&【Glide -> 4.8.0】
154156
- **2018-08-12 Version 1.7.0**
155157
- 新增 setAllFolderName() & showGif() 方法。
156158
- 新增 AlbumPhoto class

0 commit comments

Comments
 (0)