Skip to content

Commit 55f9b58

Browse files
BlankjBlankj
committed
see 01/23 log
1 parent bdb7769 commit 55f9b58

27 files changed

+377
-437
lines changed

‎utilcode/lib/src/main/java/com/blankj/utilcode/util/FileUtils.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
import java.io.IOException;
1111
import java.io.InputStream;
1212
import java.io.OutputStream;
13-
import java.net.HttpURLConnection;
1413
import java.net.URL;
1514
import java.security.DigestInputStream;
1615
import java.security.MessageDigest;
@@ -19,6 +18,8 @@
1918
import java.util.List;
2019
import java.util.Locale;
2120

21+
import javax.net.ssl.HttpsURLConnection;
22+
2223
/**
2324
* <pre>
2425
* author: Blankj
@@ -993,7 +994,7 @@ public static long getFileLength(final String filePath) {
993994
boolean isURL = filePath.matches("[a-zA-z]+://[^\\s]*");
994995
if (isURL) {
995996
try {
996-
HttpURLConnection conn = (HttpURLConnection) new URL(filePath).openConnection();
997+
HttpsURLConnection conn = (HttpsURLConnection) new URL(filePath).openConnection();
997998
conn.setRequestProperty("Accept-Encoding", "identity");
998999
conn.connect();
9991000
if (conn.getResponseCode() == 200) {

‎utilcode/lib/src/main/java/com/blankj/utilcode/util/ProcessUtils.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ public static String getForegroundProcessName() {
9797
.queryUsageStats(UsageStatsManager.INTERVAL_BEST,
9898
beginTime, endTime);
9999
}
100-
if (usageStatsList == null || usageStatsList.isEmpty()) return null;
100+
if (usageStatsList == null || usageStatsList.isEmpty()) return "";
101101
UsageStats recentStats = null;
102102
for (UsageStats usageStats : usageStatsList) {
103103
if (recentStats == null
@@ -212,7 +212,7 @@ public static String getCurrentProcessName() {
212212
ActivityManager am = (ActivityManager) Utils.getApp().getSystemService(Context.ACTIVITY_SERVICE);
213213
//noinspection ConstantConditions
214214
List<ActivityManager.RunningAppProcessInfo> info = am.getRunningAppProcesses();
215-
if (info == null || info.size() == 0) return null;
215+
if (info == null || info.size() == 0) return "";
216216
int pid = Process.myPid();
217217
for (ActivityManager.RunningAppProcessInfo aInfo : info) {
218218
if (aInfo.pid == pid) {

‎utilcode/lib/src/test/java/com/blankj/utilcode/util/FileUtilsTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ public void getDirLength() {
171171
@Test
172172
public void getFileLength() {
173173
System.out.println(FileUtils.getFileLength(PATH_FILE + "UTF8.txt"));
174-
System.out.println(FileUtils.getFileLength("https://raw.githubusercontent.com/Blankj/AndroidUtilCode/85bc44d1c8adb31027870ea4cb7a931700c80cad/LICENSE"));
174+
// System.out.println(FileUtils.getFileLength("https://raw.githubusercontent.com/Blankj/AndroidUtilCode/85bc44d1c8adb31027870ea4cb7a931700c80cad/LICENSE"));
175175
}
176176

177177
@Test

‎utilcode/lib/src/test/java/com/blankj/utilcode/util/GsonUtilsTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public void fromJson() {
5757
@Test
5858
public void getType() {
5959
Assert.assertEquals(
60-
"java.util.Collection<java.lang.String>",
60+
"java.util.List<java.lang.String>",
6161
GsonUtils.getListType(String.class).toString()
6262
);
6363
Assert.assertEquals(

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
<uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
1717
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
1818
<uses-permission android:name="android.permission.INTERNET" />
19+
<uses-permission android:name="android.permission.MODIFY_PHONE_STATE" />
1920

2021
<!-- permission -->
2122
<uses-permission android:name="android.permission.READ_CALENDAR" />

‎utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/bar/BarActivity.kt

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -36,16 +36,16 @@ class BarActivity : BaseBackActivity() {
3636
override fun initView(savedInstanceState: Bundle?, contentView: View) {
3737
setTitle(R.string.demo_bar)
3838

39-
statusBarAboutBtn.setOnClickListener(this)
40-
statusBarSetColorBtn.setOnClickListener(this)
41-
statusBarSetAlphaBtn.setOnClickListener(this)
42-
statusBarSetImageViewBtn.setOnClickListener(this)
43-
statusBarSetCustomBtn.setOnClickListener(this)
44-
statusBarSetFragmentBtn.setOnClickListener(this)
45-
statusBarSetSwipeBackBtn.setOnClickListener(this)
46-
statusBarSetDrawerBtn.setOnClickListener(this)
47-
notificationBarAboutBtn.setOnClickListener(this)
48-
navBarAboutBtn.setOnClickListener(this)
39+
barStatusAboutBtn.setOnClickListener(this)
40+
barStatusSetColorBtn.setOnClickListener(this)
41+
barStatusSetAlphaBtn.setOnClickListener(this)
42+
barStatusSetImageViewBtn.setOnClickListener(this)
43+
barStatusSetCustomBtn.setOnClickListener(this)
44+
barStatusSetFragmentBtn.setOnClickListener(this)
45+
barStatusSetSwipeBackBtn.setOnClickListener(this)
46+
barStatusSetDrawerBtn.setOnClickListener(this)
47+
barNotificationAboutBtn.setOnClickListener(this)
48+
barNavAboutBtn.setOnClickListener(this)
4949
}
5050

5151
override fun doBusiness() {
@@ -54,16 +54,16 @@ class BarActivity : BaseBackActivity() {
5454

5555
override fun onWidgetClick(view: View) {
5656
when (view.id) {
57-
R.id.statusBarAboutBtn -> BarStatusActivity.start(this)
58-
R.id.statusBarSetColorBtn -> BarStatusColorActivity.start(this)
59-
R.id.statusBarSetAlphaBtn -> BarStatusAlphaActivity.start(this)
60-
R.id.statusBarSetImageViewBtn -> BarStatusImageViewActivity.start(this)
61-
R.id.statusBarSetCustomBtn -> BarStatusCustomActivity.start(this)
62-
R.id.statusBarSetFragmentBtn -> BarStatusFragmentActivity.start(this)
63-
R.id.statusBarSetSwipeBackBtn -> BarStatusSwipeBackActivity.start(this)
64-
R.id.statusBarSetDrawerBtn -> BarStatusDrawerActivity.start(this)
65-
R.id.notificationBarAboutBtn -> BarNotificationActivity.start(this)
66-
R.id.navBarAboutBtn -> BarNavActivity.start(this)
57+
R.id.barStatusAboutBtn -> BarStatusActivity.start(this)
58+
R.id.barStatusSetColorBtn -> BarStatusColorActivity.start(this)
59+
R.id.barStatusSetAlphaBtn -> BarStatusAlphaActivity.start(this)
60+
R.id.barStatusSetImageViewBtn -> BarStatusImageViewActivity.start(this)
61+
R.id.barStatusSetCustomBtn -> BarStatusCustomActivity.start(this)
62+
R.id.barStatusSetFragmentBtn -> BarStatusFragmentActivity.start(this)
63+
R.id.barStatusSetSwipeBackBtn -> BarStatusSwipeBackActivity.start(this)
64+
R.id.barStatusSetDrawerBtn -> BarStatusDrawerActivity.start(this)
65+
R.id.barNotificationAboutBtn -> BarNotificationActivity.start(this)
66+
R.id.barNavAboutBtn -> BarNavActivity.start(this)
6767
}
6868
}
6969
}

‎utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/bar/BarNavActivity.kt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@ class BarNavActivity : BaseBackActivity() {
4141
(contentView.parent as View).setBackgroundColor(Color.GRAY)
4242
setTitle(R.string.demo_bar)
4343

44-
navShowBtn.setOnClickListener(this)
45-
navHideBtn.setOnClickListener(this)
46-
navSetColorBtn.setOnClickListener(this)
44+
barNavShowBtn.setOnClickListener(this)
45+
barNavHideBtn.setOnClickListener(this)
46+
barNavSetColorBtn.setOnClickListener(this)
4747
updateAboutNav()
4848
}
4949

@@ -53,13 +53,13 @@ class BarNavActivity : BaseBackActivity() {
5353

5454
override fun onWidgetClick(view: View) {
5555
when (view.id) {
56-
R.id.navShowBtn -> if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
56+
R.id.barNavShowBtn -> if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
5757
BarUtils.setNavBarVisibility(this, true)
5858
}
59-
R.id.navHideBtn -> if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
59+
R.id.barNavHideBtn -> if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
6060
BarUtils.setNavBarVisibility(this, false)
6161
}
62-
R.id.navSetColorBtn -> if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
62+
R.id.barNavSetColorBtn -> if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
6363
BarUtils.setNavBarColor(this, (Math.random() * 0xFFFFFFFF).toInt())
6464
}
6565
}

‎utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/bar/BarNotificationActivity.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ import kotlinx.android.synthetic.main.activity_bar_notification.*
2121
class BarNotificationActivity : BaseBackActivity() {
2222

2323
companion object {
24-
2524
fun start(context: Context) {
2625
val starter = Intent(context, BarNotificationActivity::class.java)
2726
context.startActivity(starter)

‎utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/bar/BarStatusActivity.kt

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,10 @@ class BarStatusActivity : BaseBackActivity() {
3838
override fun initView(savedInstanceState: Bundle?, contentView: View) {
3939
setTitle(R.string.demo_bar)
4040

41-
showStatusBtn.setOnClickListener(this)
42-
hideStatusBtn.setOnClickListener(this)
43-
lightModeBtn.setOnClickListener(this)
44-
darkModeBtn.setOnClickListener(this)
41+
barStatusShowBtn.setOnClickListener(this)
42+
barStatusHideBtn.setOnClickListener(this)
43+
barStatusLightModeBtn.setOnClickListener(this)
44+
barStatusDarkModeBtn.setOnClickListener(this)
4545
updateAboutStatus()
4646
}
4747

@@ -51,10 +51,10 @@ class BarStatusActivity : BaseBackActivity() {
5151

5252
override fun onWidgetClick(view: View) {
5353
when (view.id) {
54-
R.id.showStatusBtn -> BarUtils.setStatusBarVisibility(this, true)
55-
R.id.hideStatusBtn -> BarUtils.setStatusBarVisibility(this, false)
56-
R.id.lightModeBtn -> BarUtils.setStatusBarLightMode(this, true)
57-
R.id.darkModeBtn -> BarUtils.setStatusBarLightMode(this, false)
54+
R.id.barStatusShowBtn -> BarUtils.setStatusBarVisibility(this, true)
55+
R.id.barStatusHideBtn -> BarUtils.setStatusBarVisibility(this, false)
56+
R.id.barStatusLightModeBtn -> BarUtils.setStatusBarLightMode(this, true)
57+
R.id.barStatusDarkModeBtn -> BarUtils.setStatusBarLightMode(this, false)
5858
}
5959
updateAboutStatus()
6060
}

‎utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/network/NetworkActivity.java

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

0 commit comments

Comments
 (0)