Skip to content

Commit 720cace

Browse files
committed
see 01/23 log
1 parent 2ee43f1 commit 720cace

File tree

7 files changed

+74
-96
lines changed

7 files changed

+74
-96
lines changed

utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/image/ImageActivity.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,9 +110,9 @@ class ImageActivity : BaseActivity() {
110110
class ImageAdapter(list: List<ImageBean>, @LayoutRes layoutId: Int) : SingleAdapter<ImageBean>(list, layoutId) {
111111

112112
override fun bind(holder: BaseViewHolder, data: ImageBean) {
113-
val textView = holder.getView<TextView>(R.id.tv_image_name)
113+
val textView = holder.getView<TextView>(R.id.imageItemNameTv)
114114
textView.text = data.name
115-
val image = holder.getView<ImageView>(R.id.iv_image)
115+
val image = holder.getView<ImageView>(R.id.imageItemIv)
116116
image.setImageBitmap(data.image)
117117
}
118118
}

utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/snackbar/SnackbarActivity.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ class SnackbarActivity : BaseBackActivity() {
126126
SnackbarUtils.addView(R.layout.snackbar_custom, params)
127127
val snackbarView = SnackbarUtils.getView()
128128
if (snackbarView != null) {
129-
val tvSnackbarCustom = snackbarView.findViewById<TextView>(R.id.tv_snackbar_custom)
129+
val tvSnackbarCustom = snackbarView.findViewById<TextView>(R.id.snackbarCustomTv)
130130
tvSnackbarCustom.text = "点我可消失"
131131
snackbarView.setOnClickListener { SnackbarUtils.dismiss() }
132132
}

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

Lines changed: 0 additions & 89 deletions
This file was deleted.
Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
package com.blankj.utilcode.pkg.helper
2+
3+
import com.blankj.utilcode.constant.PermissionConstants
4+
import com.blankj.utilcode.util.LogUtils
5+
import com.blankj.utilcode.util.PermissionUtils
6+
7+
/**
8+
* ```
9+
* author: Blankj
10+
* blog : http://blankj.com
11+
* time : 2018/01/06
12+
* desc : helper about permission
13+
* ```
14+
*/
15+
object PermissionHelper {
16+
17+
fun requestStorage(listener: OnPermissionGrantedListener) {
18+
request(listener, PermissionConstants.STORAGE)
19+
}
20+
21+
fun requestPhone(listener: OnPermissionGrantedListener) {
22+
request(listener, PermissionConstants.PHONE)
23+
}
24+
25+
fun requestPhone(grantedListener: OnPermissionGrantedListener,
26+
deniedListener: OnPermissionDeniedListener) {
27+
request(grantedListener, deniedListener, PermissionConstants.PHONE)
28+
}
29+
30+
fun requestSms(listener: OnPermissionGrantedListener) {
31+
request(listener, PermissionConstants.SMS)
32+
}
33+
34+
private fun request(grantedListener: OnPermissionGrantedListener,
35+
@PermissionConstants.Permission vararg permissions: String) {
36+
request(grantedListener, null, *permissions)
37+
}
38+
39+
private fun request(grantedListener: OnPermissionGrantedListener,
40+
deniedListener: OnPermissionDeniedListener?,
41+
@PermissionConstants.Permission vararg permissions: String) {
42+
PermissionUtils.permission(*permissions)
43+
.rationale { shouldRequest -> DialogHelper.showRationaleDialog(shouldRequest) }
44+
.callback(object : PermissionUtils.FullCallback {
45+
override fun onGranted(permissionsGranted: List<String>) {
46+
grantedListener.onPermissionGranted()
47+
LogUtils.d(permissionsGranted)
48+
}
49+
50+
override fun onDenied(permissionsDeniedForever: List<String>, permissionsDenied: List<String>) {
51+
if (!permissionsDeniedForever.isEmpty()) {
52+
DialogHelper.showOpenAppSettingDialog()
53+
}
54+
deniedListener?.onPermissionDenied()
55+
LogUtils.d(permissionsDeniedForever, permissionsDenied)
56+
}
57+
})
58+
.request()
59+
}
60+
61+
interface OnPermissionGrantedListener {
62+
fun onPermissionGranted()
63+
}
64+
65+
interface OnPermissionDeniedListener {
66+
fun onPermissionDenied()
67+
}
68+
}

utilcode/pkg/src/main/res/layout/item_image.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66
android:orientation="vertical">
77

88
<TextView
9-
android:id="@+id/tv_image_name"
9+
android:id="@+id/imageItemNameTv"
1010
style="@style/TextStyle"
1111
android:layout_width="wrap_content"
1212
android:layout_height="wrap_content" />
1313

1414
<ImageView
15-
android:id="@+id/iv_image"
15+
android:id="@+id/imageItemIv"
1616
android:layout_width="wrap_content"
1717
android:layout_height="wrap_content" />
1818

utilcode/pkg/src/main/res/layout/snackbar_custom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<TextView
33
xmlns:android="http://schemas.android.com/apk/res/android"
4-
android:id="@+id/tv_snackbar_custom"
4+
android:id="@+id/snackbarCustomTv"
55
android:layout_width="match_parent"
66
android:layout_height="wrap_content"
77
android:layout_gravity="center"

utilcode/pkg/src/main/res/layout/toast_custom.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<TextView
33
xmlns:android="http://schemas.android.com/apk/res/android"
4-
android:id="@+id/tv_toast_message"
54
android:layout_width="wrap_content"
65
android:layout_height="wrap_content"
76
android:layout_gravity="center"

0 commit comments

Comments
 (0)