Skip to content

Commit 2ca2c82

Browse files
BlankjBlankj
committed
see 09/27 log
1 parent 29d14c8 commit 2ca2c82

File tree

169 files changed

+7226
-526
lines changed

Some content is hidden

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

169 files changed

+7226
-526
lines changed

‎CHANGELOG.md‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
* `19/08/25` [upd] ImageUtils#getImageType. [add] LogUtils# Publish v1.25.9.
1+
* `19/08/27` [add] DebugUtils.
2+
* `19/08/26` [fix] PermissionUtils NPE.
3+
* `19/08/25` [upd] ImageUtils#getImageType. [add] LogUtils#getLogFiles. Publish v1.25.9.
24
* `19/08/24` [fix] PhoneUtils#getIMEI crash on SDK 29.
35
* `19/08/23` [add] ViewUtils#isLayoutRtl.
46
* `19/08/22` [add] LogUtils#getLogFiles.

‎build.gradle‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,9 @@ allprojects {
4444
url 'https://maven.aliyun.com/repository/google'
4545
name 'replace google()'
4646
}
47+
maven {
48+
url "https://jitpack.io"
49+
}
4750
google()
4851
jcenter()
4952
}

‎buildApp.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ configApkName()
1616
android {
1717
compileSdkVersion Config.compileSdkVersion
1818
defaultConfig {
19-
minSdkVersion 16
19+
minSdkVersion Config.minSdkVersion
2020
versionCode Config.versionCode
2121
versionName Config.versionName
2222
applicationId Config.applicationId + suffix

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ class Config {
1212
static appName = 'Util'
1313

1414
static compileSdkVersion = 28
15-
static minSdkVersion = 14
15+
static minSdkVersion = 16
1616
static targetSdkVersion = 28
17-
static versionCode = 1_025_009
18-
static versionName = '1.25.9'// E.g. 1.9.72 => 1,009,072
17+
static versionCode = 1_025_010
18+
static versionName = '1.25.10-alpha3'// E.g. 1.9.72 => 1,009,072
1919

2020
// lib version
2121
static kotlin_version = '1.3.10'
@@ -94,7 +94,7 @@ class Config {
9494
],
9595

9696
free_proguard : new DepConfig("com.blankj:free-proguard:1.0.1"),
97-
swipe_panel : new DepConfig("com.blankj:swipe-panel:1.1"),
97+
swipe_panel : new DepConfig("com.blankj:swipe-panel:1.2"),
9898

9999
gson : new DepConfig("com.google.code.gson:gson:2.8.2"),
100100
glide : new DepConfig("com.github.bumptech.glide:glide:4.7.1"),
@@ -104,6 +104,7 @@ class Config {
104104
lib : new DepConfig("org.greenrobot:eventbus:3.1.1"),
105105
processor: new DepConfig("org.greenrobot:eventbus-annotation-processor:3.0.1")
106106
],
107+
photo_view : new DepConfig("com.github.chrisbanes:PhotoView:2.0.0"),
107108

108109
test : [
109110
junit : new DepConfig("junit:junit:4.12"),

‎feature/launcher/app/src/main/AndroidManifest.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
<activity
1313
android:name="com.blankj.main.pkg.MainActivity"
1414
android:configChanges="orientation|keyboardHidden|screenSize"
15-
android:launchMode="singleTask"
1615
android:screenOrientation="user"
1716
android:windowSoftInputMode="stateHidden">
1817
<intent-filter>

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
<activity
66
android:name=".MainActivity"
77
android:configChanges="orientation|keyboardHidden|screenSize"
8-
android:launchMode="singleTask"
98
android:screenOrientation="user"
109
android:windowSoftInputMode="stateHidden" />
1110
</application>

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

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

4+
<!-- app -->
5+
<uses-permission android:name="android.permission.WRITE_SETTINGS" />
6+
7+
<!-- bar -->
8+
<uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
9+
10+
<!-- 读写内存 -->
11+
<uses-permission android:name="android.permission.EXPAND_STATUS_BAR" />
12+
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
13+
14+
<!-- flashlight -->
15+
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
16+
<uses-permission android:name="android.permission.CAMERA" />
17+
18+
<!-- network -->
19+
<uses-permission android:name="android.permission.FLASHLIGHT" />
20+
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
21+
<uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
22+
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
23+
24+
<!-- permission -->
25+
<uses-permission android:name="android.permission.INTERNET" />
26+
<uses-permission android:name="android.permission.READ_CALENDAR" />
27+
<uses-permission android:name="android.permission.RECORD_AUDIO" />
28+
29+
<!-- phone -->
30+
<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
31+
<uses-permission android:name="android.permission.READ_PHONE_STATE" />
32+
<uses-permission android:name="android.permission.CALL_PHONE" />
33+
34+
<!-- process -->
35+
<uses-permission android:name="android.permission.READ_CONTACTS" />
36+
37+
<!-- vibrate -->
38+
<uses-permission android:name="android.permission.KILL_BACKGROUND_PROCESSES" />
39+
40+
<uses-permission android:name="android.permission.VIBRATE" />
41+
442
<application>
543
<activity
644
android:name=".feature.CoreUtilActivity"
@@ -210,43 +248,5 @@
210248
android:name="app_meta_data"
211249
android:value="AppMetaData" />
212250
</application>
213-
<!-- app -->
214-
<uses-permission android:name="android.permission.WRITE_SETTINGS" />
215-
216-
<!-- bar -->
217-
<uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
218-
219-
<!-- 读写内存 -->
220-
<uses-permission android:name="android.permission.EXPAND_STATUS_BAR" />
221-
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
222-
223-
<!-- flashlight -->
224-
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
225-
<uses-permission android:name="android.permission.CAMERA" />
226-
227-
<!-- network -->
228-
<uses-permission android:name="android.permission.FLASHLIGHT" />
229-
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
230-
<uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
231-
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
232-
233-
<!-- permission -->
234-
<uses-permission android:name="android.permission.INTERNET" />
235-
<uses-permission android:name="android.permission.READ_CALENDAR" />
236-
<uses-permission android:name="android.permission.RECORD_AUDIO" />
237-
238-
<!-- phone -->
239-
<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
240-
<uses-permission android:name="android.permission.READ_PHONE_STATE" />
241-
<uses-permission android:name="android.permission.CALL_PHONE" />
242-
243-
<!-- process -->
244-
<uses-permission android:name="android.permission.READ_CONTACTS" />
245-
246-
<!-- vibrate -->
247-
<uses-permission android:name="android.permission.KILL_BACKGROUND_PROCESSES" />
248-
249-
<uses-permission android:name="android.permission.VIBRATE" />
250-
251251

252252
</manifest>

‎feature/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/activity/ActivityActivity.kt‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ import com.blankj.utilcode.pkg.R
1414
import com.blankj.utilcode.pkg.feature.CoreUtilActivity
1515
import com.blankj.utilcode.util.ActivityUtils
1616
import com.blankj.utilcode.util.AppUtils
17+
import com.blankj.utilcode.util.LogUtils
1718
import com.blankj.utilcode.util.SpanUtils
1819
import kotlinx.android.synthetic.main.activity_activity.*
1920
import java.util.*
@@ -166,7 +167,10 @@ class ActivityActivity : CommonTitleActivity() {
166167
R.id.activityStartLauncherActivityBtn -> ActivityUtils.startLauncherActivity()
167168
R.id.activityFinishActivityBtn -> ActivityUtils.finishActivity(CoreUtilActivity::class.java)
168169
R.id.activityFinishToActivityBtn -> ActivityUtils.finishToActivity(CoreUtilActivity::class.java, false, true)
169-
R.id.activityFinishAllActivitiesBtn -> ActivityUtils.finishAllActivities()
170+
R.id.activityFinishAllActivitiesBtn -> {
171+
// ActivityUtils.finishAllActivities()
172+
ActivityUtils.startActivityForResult(Bundle(), this, SubActivityActivity::class.java, 10)
173+
}
170174
}
171175
}
172176

@@ -197,4 +201,9 @@ class ActivityActivity : CommonTitleActivity() {
197201
else -> return null
198202
}
199203
}
204+
205+
override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
206+
super.onActivityResult(requestCode, resultCode, data)
207+
LogUtils.e(requestCode, resultCode, data)
208+
}
200209
}

‎feature/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/activity/SubActivityActivity.kt‎

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,16 @@
11
package com.blankj.utilcode.pkg.feature.activity
22

3+
import android.app.Activity
4+
import android.content.Intent
35
import android.os.Build
46
import android.os.Bundle
57
import android.support.v4.app.ActivityCompat
68
import android.view.View
79
import android.view.Window
810
import com.blankj.common.CommonTitleActivity
9-
import com.blankj.utilcode.pkg.R
1011
import com.blankj.utilcode.util.ColorUtils
12+
import kotlinx.android.synthetic.main.activity_activity_sub.*
13+
1114

1215
/**
1316
* ```
@@ -25,15 +28,21 @@ class SubActivityActivity : CommonTitleActivity() {
2528
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
2629
window.requestFeature(Window.FEATURE_CONTENT_TRANSITIONS)
2730
}
28-
return R.layout.activity_activity_sub
31+
return com.blankj.utilcode.pkg.R.layout.activity_activity_sub
2932
}
3033

3134
override fun bindTitle(): String {
32-
return getString(R.string.demo_activity)
35+
return getString(com.blankj.utilcode.pkg.R.string.demo_activity)
3336
}
3437

3538
override fun initView(savedInstanceState: Bundle?, contentView: View?) {
3639
contentView?.setBackgroundColor(ColorUtils.getRandomColor(false))
40+
activityViewSharedElement.setOnClickListener(View.OnClickListener {
41+
val result = Intent()
42+
result.putExtra("data", "data")
43+
this@SubActivityActivity.setResult(Activity.RESULT_OK, result)
44+
this@SubActivityActivity.finish()
45+
})
3746
}
3847

3948
override fun doBusiness() {}

‎feature/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/bus/BusActivity.kt‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,11 +55,6 @@ class BusActivity : CommonTitleActivity() {
5555
})
5656
}
5757

58-
@BusUtils.Bus(tag = "_PusNotifyData", sticky = true, threadMode = BusUtils.ThreadMode.MAIN)
59-
fun onPusNotifyData(pusNotifyData: PusNotifyData) {
60-
LogUtils.e("haha")
61-
}
62-
6358
companion object {
6459
const val TAG_BASIC_TYPE = "tag_basic_type"
6560
const val TAG_BUS = "tag_bus"

0 commit comments

Comments
 (0)