Skip to content

Commit 6dd4522

Browse files
BlankjBlankj
committed
see 01/25 log
1 parent f594184 commit 6dd4522

File tree

6 files changed

+92
-117
lines changed

6 files changed

+92
-117
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@ import android.content.Intent
55
import android.os.Bundle
66
import android.view.View
77
import com.blankj.lib.base.BaseBackActivity
8-
import com.blankj.subutil.pkg.feature.brightness.BrightnessActivity
9-
import com.blankj.subutil.pkg.feature.flashlight.FlashlightActivity
108
import com.blankj.utilcode.pkg.R
119
import com.blankj.utilcode.pkg.feature.activity.ActivityActivity
1210
import com.blankj.utilcode.pkg.feature.adaptScreen.AdaptScreenActivity
1311
import com.blankj.utilcode.pkg.feature.app.AppActivity
1412
import com.blankj.utilcode.pkg.feature.bar.BarActivity
13+
import com.blankj.utilcode.pkg.feature.brightness.BrightnessActivity
1514
import com.blankj.utilcode.pkg.feature.clean.CleanActivity
1615
import com.blankj.utilcode.pkg.feature.device.DeviceActivity
16+
import com.blankj.utilcode.pkg.feature.flashlight.FlashlightActivity
1717
import com.blankj.utilcode.pkg.feature.fragment.FragmentActivity
1818
import com.blankj.utilcode.pkg.feature.image.ImageActivity
1919
import com.blankj.utilcode.pkg.feature.keyboard.KeyboardActivity

‎utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/app/AppActivity.kt‎

Lines changed: 23 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import com.blankj.utilcode.pkg.Config
99
import com.blankj.utilcode.pkg.R
1010
import com.blankj.utilcode.pkg.helper.PermissionHelper
1111
import com.blankj.utilcode.util.*
12+
import com.blankj.utilcode.util.AppUtils.installApp
1213
import kotlinx.android.synthetic.main.activity_app.*
1314

1415
/**
@@ -23,8 +24,20 @@ class AppActivity : BaseBackActivity() {
2324

2425
companion object {
2526
fun start(context: Context) {
26-
val starter = Intent(context, AppActivity::class.java)
27-
context.startActivity(starter)
27+
requestStoragePermission(context)
28+
}
29+
30+
private fun requestStoragePermission(context: Context) {
31+
PermissionHelper.requestStorage(object : PermissionHelper.OnPermissionGrantedListener {
32+
override fun onPermissionGranted() {
33+
val starter = Intent(context, AppActivity::class.java)
34+
context.startActivity(starter)
35+
}
36+
}, object : PermissionHelper.OnPermissionDeniedListener {
37+
override fun onPermissionDenied() {
38+
requestStoragePermission(context)
39+
}
40+
})
2841
}
2942
}
3043

@@ -81,7 +94,12 @@ class AppActivity : BaseBackActivity() {
8194
R.id.appInstallAppBtn -> if (AppUtils.isAppInstalled(Config.TEST_PKG)) {
8295
ToastUtils.showShort(R.string.app_install_tips)
8396
} else {
84-
installApp()
97+
if (!FileUtils.isFileExists(Config.TEST_APK_PATH)) {
98+
ReleaseInstallApkTask(listener).execute()
99+
} else {
100+
listener.onReleased()
101+
LogUtils.d("test apk existed.")
102+
}
85103
}
86104
R.id.appInstallAppSilentBtn -> if (AppUtils.isAppInstalled(Config.TEST_PKG)) {
87105
ToastUtils.showShort(R.string.app_install_tips)
@@ -112,34 +130,17 @@ class AppActivity : BaseBackActivity() {
112130
R.id.appExitAppBtn -> AppUtils.exitApp()
113131
}
114132
}
115-
116-
private fun installApp() {
117-
PermissionHelper.requestStorage(object : PermissionHelper.OnPermissionGrantedListener {
118-
override fun onPermissionGranted() {
119-
if (!FileUtils.isFileExists(Config.TEST_APK_PATH)) {
120-
ReleaseInstallApkTask(listener).execute()
121-
} else {
122-
listener.onReleased()
123-
LogUtils.d("test apk existed.")
124-
}
125-
}
126-
}, object : PermissionHelper.OnPermissionDeniedListener {
127-
override fun onPermissionDenied() {
128-
installApp()
129-
}
130-
})
131-
}
132133
}
133134

134-
class ReleaseInstallApkTask(private val mListener: OnReleasedListener?) : ThreadUtils.SimpleTask<Void>() {
135+
class ReleaseInstallApkTask(private val mListener: OnReleasedListener) : ThreadUtils.SimpleTask<Void>() {
135136

136137
override fun doInBackground(): Void? {
137138
ResourceUtils.copyFileFromAssets("test_install", Config.TEST_APK_PATH)
138139
return null
139140
}
140141

141142
override fun onSuccess(result: Void?) {
142-
mListener?.onReleased()
143+
mListener.onReleased()
143144
}
144145

145146
fun execute() {

‎utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/flashlight/FlashlightActivity.kt‎

Lines changed: 22 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,9 @@ import android.os.Bundle
66
import android.view.View
77
import com.blankj.lib.base.BaseBackActivity
88
import com.blankj.subutil.util.FlashlightUtils
9+
import com.blankj.subutil.util.LocationUtils.register
910
import com.blankj.utilcode.pkg.R
11+
import com.blankj.utilcode.pkg.R.id.flashlightAboutTv
1012
import com.blankj.utilcode.pkg.helper.PermissionHelper
1113
import com.blankj.utilcode.util.SpanUtils
1214
import com.blankj.utilcode.util.ToastUtils
@@ -24,8 +26,24 @@ class FlashlightActivity : BaseBackActivity() {
2426

2527
companion object {
2628
fun start(context: Context) {
27-
val starter = Intent(context, FlashlightActivity::class.java)
28-
context.startActivity(starter)
29+
if (!FlashlightUtils.isFlashlightEnable()) {
30+
ToastUtils.showLong("Didn't support flashlight.")
31+
return
32+
}
33+
requestCameraPermission(context)
34+
}
35+
36+
private fun requestCameraPermission(context: Context) {
37+
PermissionHelper.requestCamera(object : PermissionHelper.OnPermissionGrantedListener {
38+
override fun onPermissionGranted() {
39+
val starter = Intent(context, FlashlightActivity::class.java)
40+
context.startActivity(starter)
41+
}
42+
}, object : PermissionHelper.OnPermissionDeniedListener {
43+
override fun onPermissionDenied() {
44+
requestCameraPermission(context)
45+
}
46+
})
2947
}
3048
}
3149

@@ -43,25 +61,8 @@ class FlashlightActivity : BaseBackActivity() {
4361
}
4462

4563
override fun doBusiness() {
46-
if (!FlashlightUtils.isFlashlightEnable()) {
47-
ToastUtils.showLong("Didn't support flashlight.")
48-
finish()
49-
return
50-
}
51-
register()
52-
}
53-
54-
private fun register() {
55-
PermissionHelper.requestCamera(object : PermissionHelper.OnPermissionGrantedListener {
56-
override fun onPermissionGranted() {
57-
FlashlightUtils.getInstance().register()
58-
updateAboutFlashlight()
59-
}
60-
}, object : PermissionHelper.OnPermissionDeniedListener {
61-
override fun onPermissionDenied() {
62-
register()
63-
}
64-
})
64+
FlashlightUtils.getInstance().register()
65+
updateAboutFlashlight()
6566
}
6667

6768
override fun onWidgetClick(view: View) {

‎utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/permission/PermissionActivity.kt‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -80,16 +80,18 @@ class PermissionActivity : BaseBackActivity() {
8080
.rationale { shouldRequest -> DialogHelper.showRationaleDialog(shouldRequest) }
8181
.callback(object : PermissionUtils.FullCallback {
8282
override fun onGranted(permissionsGranted: List<String>) {
83-
updateAboutPermission()
8483
LogUtils.d(permissionsGranted)
84+
updateAboutPermission()
8585
}
8686

8787
override fun onDenied(permissionsDeniedForever: List<String>,
8888
permissionsDenied: List<String>) {
89+
LogUtils.d(permissionsDeniedForever, permissionsDenied)
8990
if (!permissionsDeniedForever.isEmpty()) {
9091
DialogHelper.showOpenAppSettingDialog()
92+
return
9193
}
92-
LogUtils.d(permissionsDeniedForever, permissionsDenied)
94+
requestCalendar()
9395
}
9496
})
9597
.theme { activity -> ScreenUtils.setFullScreen(activity) }
@@ -101,16 +103,18 @@ class PermissionActivity : BaseBackActivity() {
101103
.rationale { shouldRequest -> DialogHelper.showRationaleDialog(shouldRequest) }
102104
.callback(object : PermissionUtils.FullCallback {
103105
override fun onGranted(permissionsGranted: List<String>) {
104-
updateAboutPermission()
105106
LogUtils.d(permissionsGranted)
107+
updateAboutPermission()
106108
}
107109

108110
override fun onDenied(permissionsDeniedForever: List<String>,
109111
permissionsDenied: List<String>) {
112+
LogUtils.d(permissionsDeniedForever, permissionsDenied)
110113
if (!permissionsDeniedForever.isEmpty()) {
111114
DialogHelper.showOpenAppSettingDialog()
115+
return
112116
}
113-
LogUtils.d(permissionsDeniedForever, permissionsDenied)
117+
requestRecordAudio()
114118
}
115119
})
116120
.request()
@@ -121,16 +125,18 @@ class PermissionActivity : BaseBackActivity() {
121125
.rationale { shouldRequest -> DialogHelper.showRationaleDialog(shouldRequest) }
122126
.callback(object : PermissionUtils.FullCallback {
123127
override fun onGranted(permissionsGranted: List<String>) {
124-
updateAboutPermission()
125128
LogUtils.d(permissionsGranted)
129+
updateAboutPermission()
126130
}
127131

128132
override fun onDenied(permissionsDeniedForever: List<String>,
129133
permissionsDenied: List<String>) {
134+
LogUtils.d(permissionsDeniedForever, permissionsDenied)
130135
if (!permissionsDeniedForever.isEmpty()) {
131136
DialogHelper.showOpenAppSettingDialog()
137+
return
132138
}
133-
LogUtils.d(permissionsDeniedForever, permissionsDenied)
139+
requestCalendarAndRecordAudio()
134140
}
135141
})
136142
.request()

‎utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/phone/PhoneActivity.kt‎

Lines changed: 30 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,11 @@ import android.content.Intent
55
import android.os.Bundle
66
import android.view.View
77
import com.blankj.lib.base.BaseBackActivity
8+
import com.blankj.utilcode.constant.PermissionConstants
89
import com.blankj.utilcode.pkg.R
910
import com.blankj.utilcode.pkg.helper.PermissionHelper
1011
import com.blankj.utilcode.util.PhoneUtils
12+
import com.blankj.utilcode.util.PhoneUtils.sendSmsSilent
1113
import com.blankj.utilcode.util.SpanUtils
1214
import kotlinx.android.synthetic.main.activity_phone.*
1315

@@ -23,8 +25,20 @@ class PhoneActivity : BaseBackActivity() {
2325

2426
companion object {
2527
fun start(context: Context) {
26-
val starter = Intent(context, PhoneActivity::class.java)
27-
context.startActivity(starter)
28+
requestPhoneAndSmsPermission(context)
29+
}
30+
31+
private fun requestPhoneAndSmsPermission(context: Context) {
32+
PermissionHelper.requestPhoneAndSms(object : PermissionHelper.OnPermissionGrantedListener {
33+
override fun onPermissionGranted() {
34+
val starter = Intent(context, PhoneActivity::class.java)
35+
context.startActivity(starter)
36+
}
37+
}, object : PermissionHelper.OnPermissionDeniedListener {
38+
override fun onPermissionDenied() {
39+
requestPhoneAndSmsPermission(context)
40+
}
41+
})
2842
}
2943
}
3044

@@ -38,77 +52,35 @@ class PhoneActivity : BaseBackActivity() {
3852

3953
override fun initView(savedInstanceState: Bundle?, contentView: View) {
4054
setTitle(R.string.demo_phone)
41-
requestPhonePermission()
55+
SpanUtils.with(phoneAboutTv)
56+
.appendLine("isPhone: " + PhoneUtils.isPhone())
57+
.appendLine("getDeviceId: " + PhoneUtils.getDeviceId())
58+
.appendLine("getIMEI: " + PhoneUtils.getIMEI())
59+
.appendLine("getMEID: " + PhoneUtils.getMEID())
60+
.appendLine("getIMSI: " + PhoneUtils.getIMSI())
61+
.appendLine("getPhoneType: " + PhoneUtils.getPhoneType())
62+
.appendLine("isSimCardReady: " + PhoneUtils.isSimCardReady())
63+
.appendLine("getSimOperatorName: " + PhoneUtils.getSimOperatorName())
64+
.appendLine("getSimOperatorByMnc: " + PhoneUtils.getSimOperatorByMnc())
65+
.appendLine("getPhoneStatus: " + PhoneUtils.getPhoneStatus())
66+
.create()
4267

4368
phoneDialBtn.setOnClickListener(this)
4469
phoneCallBtn.setOnClickListener(this)
4570
phoneSendSmsBtn.setOnClickListener(this)
4671
phoneSendSmsSilentBtn.setOnClickListener(this)
4772
}
4873

49-
private fun requestPhonePermission() {
50-
PermissionHelper.requestPhone(
51-
object : PermissionHelper.OnPermissionGrantedListener {
52-
override fun onPermissionGranted() {
53-
SpanUtils.with(phoneAboutTv)
54-
.appendLine("isPhone: " + PhoneUtils.isPhone())
55-
.appendLine("getDeviceId: " + PhoneUtils.getDeviceId())
56-
.appendLine("getIMEI: " + PhoneUtils.getIMEI())
57-
.appendLine("getMEID: " + PhoneUtils.getMEID())
58-
.appendLine("getIMSI: " + PhoneUtils.getIMSI())
59-
.appendLine("getPhoneType: " + PhoneUtils.getPhoneType())
60-
.appendLine("isSimCardReady: " + PhoneUtils.isSimCardReady())
61-
.appendLine("getSimOperatorName: " + PhoneUtils.getSimOperatorName())
62-
.appendLine("getSimOperatorByMnc: " + PhoneUtils.getSimOperatorByMnc())
63-
.appendLine("getPhoneStatus: " + PhoneUtils.getPhoneStatus())
64-
.create()
65-
}
66-
},
67-
object : PermissionHelper.OnPermissionDeniedListener {
68-
override fun onPermissionDenied() {
69-
requestPhonePermission()
70-
}
71-
})
72-
}
73-
7474
override fun doBusiness() {
7575

7676
}
7777

7878
override fun onWidgetClick(view: View) {
7979
when (view.id) {
8080
R.id.phoneDialBtn -> PhoneUtils.dial("10000")
81-
R.id.phoneCallBtn -> {
82-
call()
83-
}
81+
R.id.phoneCallBtn -> PhoneUtils.call("10000")
8482
R.id.phoneSendSmsBtn -> PhoneUtils.sendSms("10000", "sendSms")
85-
R.id.phoneSendSmsSilentBtn -> {
86-
sendSmsSilent()
87-
}
83+
R.id.phoneSendSmsSilentBtn -> PhoneUtils.sendSmsSilent("10000", "sendSmsSilent")
8884
}
8985
}
90-
91-
private fun call() {
92-
PermissionHelper.requestPhone(object : PermissionHelper.OnPermissionGrantedListener {
93-
override fun onPermissionGranted() {
94-
PhoneUtils.call("10000")
95-
}
96-
}, object : PermissionHelper.OnPermissionDeniedListener {
97-
override fun onPermissionDenied() {
98-
call()
99-
}
100-
})
101-
}
102-
103-
private fun sendSmsSilent() {
104-
PermissionHelper.requestSms(object : PermissionHelper.OnPermissionGrantedListener {
105-
override fun onPermissionGranted() {
106-
PhoneUtils.sendSmsSilent("10000", "sendSmsSilent")
107-
}
108-
}, object : PermissionHelper.OnPermissionDeniedListener {
109-
override fun onPermissionDenied() {
110-
sendSmsSilent();
111-
}
112-
})
113-
}
11486
}

‎utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/helper/PermissionHelper.kt‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,9 @@ object PermissionHelper {
2424
request(listener, deniedListener, PermissionConstants.STORAGE)
2525
}
2626

27-
fun requestPhone(listener: OnPermissionGrantedListener,
28-
deniedListener: OnPermissionDeniedListener) {
29-
request(listener, deniedListener, PermissionConstants.PHONE)
30-
}
31-
32-
fun requestSms(listener: OnPermissionGrantedListener,
33-
deniedListener: OnPermissionDeniedListener) {
34-
request(listener, deniedListener, PermissionConstants.SMS)
27+
fun requestPhoneAndSms(listener: OnPermissionGrantedListener,
28+
deniedListener: OnPermissionDeniedListener) {
29+
request(listener, deniedListener, PermissionConstants.PHONE, PermissionConstants.SMS)
3530
}
3631

3732
private fun request(grantedListener: OnPermissionGrantedListener,

0 commit comments

Comments
 (0)