Skip to content

Commit a1e9d83

Browse files
BlankjBlankj
committed
see 05/08 log
1 parent fa6ba9f commit a1e9d83

File tree

19 files changed

+530
-64
lines changed

19 files changed

+530
-64
lines changed

‎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.14.4-brightgreen.svg
44+
[aucsvg]: https://img.shields.io/badge/AndroidUtilCode-v1.15.0-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.14.4-brightgreen.svg
44+
[aucsvg]: https://img.shields.io/badge/AndroidUtilCode-v1.15.0-brightgreen.svg
4545
[auc]: https://github.com/Blankj/AndroidUtilCode
4646

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

‎app/src/main/AndroidManifest.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,9 @@
140140
<activity
141141
android:name=".feature.core.reflect.ReflectActivity"
142142
android:launchMode="singleTop" />
143+
<activity
144+
android:name=".feature.core.resource.ResourceActivity"
145+
android:launchMode="singleTop" />
143146
<activity
144147
android:name=".feature.core.screen.ScreenActivity"
145148
android:launchMode="singleTop" />

‎app/src/main/assets/test/sub/test.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
1st line
2+
2nd line

‎app/src/main/assets/test/test.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
1st line
2+
2nd line

‎app/src/main/java/com/blankj/androidutilcode/feature/core/CoreUtilActivity.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import com.blankj.androidutilcode.feature.core.phone.PhoneActivity;
2323
import com.blankj.androidutilcode.feature.core.process.ProcessActivity;
2424
import com.blankj.androidutilcode.feature.core.reflect.ReflectActivity;
25+
import com.blankj.androidutilcode.feature.core.resource.ResourceActivity;
2526
import com.blankj.androidutilcode.feature.core.screen.ScreenActivity;
2627
import com.blankj.androidutilcode.feature.core.sdcard.SDCardActivity;
2728
import com.blankj.androidutilcode.feature.core.snackbar.SnackbarActivity;
@@ -133,6 +134,10 @@ public void reflectClick(View view) {
133134
ReflectActivity.start(this);
134135
}
135136

137+
public void resourceClick(View view) {
138+
ResourceActivity.start(this);
139+
}
140+
136141
public void screenClick(View view) {
137142
ScreenActivity.start(this);
138143
}

‎app/src/main/java/com/blankj/androidutilcode/feature/core/resource/ResourceActivity.java

Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
package com.blankj.androidutilcode.feature.core.resource;
2+
3+
import android.content.Context;
4+
import android.content.Intent;
5+
import android.os.Bundle;
6+
import android.support.annotation.Nullable;
7+
import android.view.View;
8+
import android.widget.TextView;
9+
10+
import com.blankj.androidutilcode.Config;
11+
import com.blankj.androidutilcode.R;
12+
import com.blankj.androidutilcode.base.BaseBackActivity;
13+
import com.blankj.utilcode.util.ResourceUtils;
14+
import com.blankj.utilcode.util.SpanUtils;
15+
16+
/**
17+
* <pre>
18+
* author: Blankj
19+
* blog : http://blankj.com
20+
* time : 2018/05/07
21+
* desc :
22+
* </pre>
23+
*/
24+
public class ResourceActivity extends BaseBackActivity {
25+
26+
public static void start(Context context) {
27+
Intent starter = new Intent(context, ResourceActivity.class);
28+
context.startActivity(starter);
29+
}
30+
31+
@Override
32+
public void initData(@Nullable Bundle bundle) {
33+
34+
}
35+
36+
@Override
37+
public int bindLayout() {
38+
return R.layout.activity_resource;
39+
}
40+
41+
@Override
42+
public void initView(Bundle savedInstanceState, View contentView) {
43+
findViewById(R.id.btn_resource_test_assets).setOnClickListener(this);
44+
findViewById(R.id.btn_resource_test_raw).setOnClickListener(this);
45+
TextView tvAboutResource = findViewById(R.id.tv_about_resource);
46+
47+
tvAboutResource.setText(new SpanUtils()
48+
.appendLine("readAssets2String: " + ResourceUtils.readAssets2String("test/test.txt"))
49+
.appendLine("readAssets2List: " + ResourceUtils.readAssets2List("test/test.txt").toString())
50+
.append("readRaw2List: " + ResourceUtils.readRaw2List(R.raw.test).toString())
51+
.create());
52+
}
53+
54+
@Override
55+
public void doBusiness() {
56+
57+
}
58+
59+
@Override
60+
public void onWidgetClick(View view) {
61+
switch (view.getId()) {
62+
case R.id.btn_resource_test_assets:
63+
ResourceUtils.copyFileFromAssets("test", Config.CACHE_PATH + "/assets/test");
64+
break;
65+
case R.id.btn_resource_test_raw:
66+
ResourceUtils.copyFileFromRaw(R.raw.test, Config.CACHE_PATH + "/raw/test.txt");
67+
break;
68+
}
69+
}
70+
}

‎app/src/main/res_core/layout/activity_resource.xml

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<LinearLayout
3+
xmlns:android="http://schemas.android.com/apk/res/android"
4+
android:layout_width="match_parent"
5+
android:layout_height="wrap_content"
6+
android:gravity="center_horizontal"
7+
android:orientation="vertical"
8+
android:padding="@dimen/spacing_16">
9+
10+
<TextView
11+
android:id="@+id/tv_about_resource"
12+
style="@style/TextStyle"
13+
android:layout_width="match_parent"
14+
android:layout_height="wrap_content" />
15+
16+
<Button
17+
android:id="@+id/btn_resource_test_assets"
18+
style="@style/WideBtnStyle"
19+
android:layout_width="match_parent"
20+
android:layout_height="wrap_content"
21+
android:text="@string/resource_test_assets" />
22+
23+
<Button
24+
android:id="@+id/btn_resource_test_raw"
25+
style="@style/WideBtnStyle"
26+
android:layout_width="match_parent"
27+
android:layout_height="wrap_content"
28+
android:text="@string/resource_test_raw" />
29+
30+
</LinearLayout>

‎app/src/main/res_core/layout/activity_util_core.xml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,13 @@
113113
android:onClick="reflectClick"
114114
android:text="@string/demo_reflect" />
115115

116+
<Button
117+
style="@style/WideBtnStyle"
118+
android:layout_width="match_parent"
119+
android:layout_height="wrap_content"
120+
android:onClick="resourceClick"
121+
android:text="@string/demo_resource" />
122+
116123
<Button
117124
style="@style/WideBtnStyle"
118125
android:layout_width="match_parent"

‎app/src/main/res_core/raw/test.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
1st line
2+
2nd line

‎app/src/main/res_core/values/strings.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
<string name="demo_phone">PhoneUtils Demo</string>
1616
<string name="demo_process">ProcessUtils Demo</string>
1717
<string name="demo_reflect">ReflectUtils Demo</string>
18+
<string name="demo_resource">ResourceUtils Demo</string>
1819
<string name="demo_screen">ScreenUtils Demo</string>
1920
<string name="demo_sdcard">SDCardUtils Demo</string>
2021
<string name="demo_snackbar">Snackbar Demo</string>
@@ -208,6 +209,10 @@
208209
<!--Process 相关-->
209210
<string name="process_kill_all_background">Kill All Background Processes</string>
210211

212+
<!--Resource 相关-->
213+
<string name="resource_test_assets">Test Assets</string>
214+
<string name="resource_test_raw">Test Raw</string>
215+
211216
<!--Screen 相关-->
212217
<string name="screen_set_fullscreen">Set Fullscreen</string>
213218
<string name="screen_set_landscape">Set Landscape</string>

‎build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ ext {
4444
min_sdk_version = 14
4545
target_sdk_version = 27
4646

47-
version_code = 1_014_004
48-
version_name = '1.14.4'// E.g 1.9.72 => 1,009,072
47+
version_code = 1_015_000
48+
version_name = '1.15.0'// E.g 1.9.72 => 1,009,072
4949

5050
// App dependencies
5151
support_version = '27.1.0'

‎update_log.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
* 18/05/08 新增 ResourceUtils，发布 1.15.0 版本
12
* 18/05/07 修复 ZipUtils 漏洞，发布 1.14.4 版本
23
* 18/05/03 修复 ToastUtils 默认字体大小问题，发布 1.14.3 版本
34
* 18/05/02 修复 PermissionUtils 空异常，发布 1.14.2 版本

‎utilcode/README-CN.md

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
Gradle:
44
```groovy
5-
implementation 'com.blankj:utilcode:1.14.4'
5+
implementation 'com.blankj:utilcode:1.15.0'
66
```
77

88

@@ -469,6 +469,16 @@ getReplaceFirst: 替换正则匹配的第一部分
469469
getReplaceAll : 替换所有正则匹配的部分
470470
```
471471

472+
* ### 资源相关 -> [ResourceUtils.java][resource.java] -> [Demo][resource.demo]
473+
```
474+
copyFileFromAssets: 从 assets 中拷贝文件
475+
readAssets2String : 从 assets 中读取字符串
476+
readAssets2List : 从 assets 中按行读取字符串
477+
copyFileFromRaw : 从 raw 中拷贝文件
478+
readRaw2String : 从 raw 中读取字符串
479+
readRaw2List : 从 raw 中按行读取字符串
480+
```
481+
472482
* ### 屏幕相关 -> [ScreenUtils.java][screen.java] -> [Demo][screen.demo]
473483
```
474484
getScreenWidth : 获取屏幕的宽度（单位：px）
@@ -745,6 +755,9 @@ getComments : 获取压缩文件中的注释链表
745755
[regex.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/src/main/java/com/blankj/utilcode/util/RegexUtils.java
746756
[regex.test]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/src/test/java/com/blankj/utilcode/util/RegexUtilsTest.java
747757

758+
[resource.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/src/main/java/com/blankj/utilcode/util/ResourceUtils.java
759+
[resource.demo]: https://github.com/Blankj/AndroidUtilCode/blob/master/app/src/main/java/com/blankj/androidutilcode/feature/core/resource/ResourceActivity.java
760+
748761
[screen.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/src/main/java/com/blankj/utilcode/util/ScreenUtils.java
749762
[screen.demo]: https://github.com/Blankj/AndroidUtilCode/blob/master/app/src/main/java/com/blankj/androidutilcode/feature/core/screen/ScreenActivity.java
750763

‎utilcode/README.md

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
Gradle:
44
```groovy
5-
implementation 'com.blankj:utilcode:1.14.4'
5+
implementation 'com.blankj:utilcode:1.15.0'
66
```
77

88

@@ -469,6 +469,16 @@ getReplaceFirst
469469
getReplaceAll
470470
```
471471

472+
* ### About Resource -> [ResourceUtils.java][resource.java] -> [Demo][resource.demo]
473+
```
474+
copyFileFromAssets
475+
readAssets2String
476+
readAssets2List
477+
copyFileFromRaw
478+
readRaw2String
479+
readRaw2List
480+
```
481+
472482
* ### About Screen -> [ScreenUtils.java][screen.java] -> [Demo][screen.demo]
473483
```
474484
getScreenWidth
@@ -745,6 +755,9 @@ getComments
745755
[regex.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/src/main/java/com/blankj/utilcode/util/RegexUtils.java
746756
[regex.test]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/src/test/java/com/blankj/utilcode/util/RegexUtilsTest.java
747757

758+
[resource.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/src/main/java/com/blankj/utilcode/util/ResourceUtils.java
759+
[resource.demo]: https://github.com/Blankj/AndroidUtilCode/blob/master/app/src/main/java/com/blankj/androidutilcode/feature/core/resource/ResourceActivity.java
760+
748761
[screen.java]: https://github.com/Blankj/AndroidUtilCode/blob/master/utilcode/src/main/java/com/blankj/utilcode/util/ScreenUtils.java
749762
[screen.demo]: https://github.com/Blankj/AndroidUtilCode/blob/master/app/src/main/java/com/blankj/androidutilcode/feature/core/screen/ScreenActivity.java
750763

0 commit comments

Comments
 (0)