Skip to content

Commit 253bebf

Browse files
BlankjBlankj
committed
see 07/29 log
1 parent 5851344 commit 253bebf

File tree

22 files changed

+513
-212
lines changed

22 files changed

+513
-212
lines changed

‎CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
* `19/07/29` [fix] BusUtils post father class useless. KeyboardUtils#hideSoft bug. Publish v1.25.4.
12
* `19/07/28` [add] NetworkUtils#(un)registerNetworkStatusChangedListener. Publish v1.25.3.
23
* `19/07/27` [fix] ThreadUtils memory leak.
34
* `19/07/26` [add] ContainerUtils. Publish v1.25.2.

‎README-CN.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545

4646
[frame]: https://raw.githubusercontent.com/Blankj/AndroidUtilCode/master/art/auc_frame.png
4747

48-
[aucSvg]: https://img.shields.io/badge/AndroidUtilCode-v1.25.3-brightgreen.svg
48+
[aucSvg]: https://img.shields.io/badge/AndroidUtilCode-v1.25.4-brightgreen.svg
4949
[auc]: https://github.com/Blankj/AndroidUtilCode
5050

5151
[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
@@ -45,7 +45,7 @@ If this project helps you a lot and you want to support the project's developmen
4545

4646
[frame]: https://raw.githubusercontent.com/Blankj/AndroidUtilCode/master/art/auc_frame.png
4747

48-
[aucSvg]: https://img.shields.io/badge/AndroidUtilCode-v1.25.3-brightgreen.svg
48+
[aucSvg]: https://img.shields.io/badge/AndroidUtilCode-v1.25.4-brightgreen.svg
4949
[auc]: https://github.com/Blankj/AndroidUtilCode
5050

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

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@ class Config {
1111
static applicationId = 'com.blankj.androidutilcode'
1212
static appName = 'Util'
1313

14-
static compileSdkVersion = 27
14+
static compileSdkVersion = 28
1515
static minSdkVersion = 14
16-
static targetSdkVersion = 27
17-
static versionCode = 1_025_003
18-
static versionName = '1.25.3'// E.g. 1.9.72 => 1,009,072
16+
static targetSdkVersion = 28
17+
static versionCode = 1_025_004
18+
static versionName = '1.25.4'// E.g. 1.9.72 => 1,009,072
1919

2020
// lib version
2121
static kotlin_version = '1.3.10'
22-
static support_version = '27.1.1'
22+
static support_version = '28.0.0'
2323
static leakcanary_version = '1.6.3'
2424

2525
// appConfig 配置的是可以跑 app 的模块，git 提交务必只包含 launcher

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

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import com.blankj.utilcode.pkg.R
1010
import com.blankj.utilcode.util.BusUtils
1111
import com.blankj.utilcode.util.Utils
1212
import kotlinx.android.synthetic.main.activity_bus.*
13+
import kotlin.random.Random
1314

1415
/**
1516
* ```
@@ -21,6 +22,11 @@ import kotlinx.android.synthetic.main.activity_bus.*
2122
*/
2223
class BusActivity : CommonTitleActivity() {
2324

25+
@BusUtils.Bus(tag = TAG_BASIC_TYPE)
26+
fun test(param: Int) {
27+
busAboutTv.text = param.toString()
28+
}
29+
2430
@BusUtils.Bus(tag = TAG_BUS)
2531
fun test(param: String) {
2632
busAboutTv.text = param
@@ -40,6 +46,7 @@ class BusActivity : CommonTitleActivity() {
4046
}
4147

4248
companion object {
49+
const val TAG_BASIC_TYPE = "tag_basic_type"
4350
const val TAG_BUS = "tag_bus"
4451
const val TAG_STICKY_BUS = "tag_sticky_bus"
4552
const val TAG_IO = "tag_io"
@@ -65,6 +72,7 @@ class BusActivity : CommonTitleActivity() {
6572
busRegister,
6673
busUnregister,
6774
busPost,
75+
busPostBasicType,
6876
busPostSticky,
6977
busPost2IoThread,
7078
busRemoveSticky,
@@ -88,6 +96,9 @@ class BusActivity : CommonTitleActivity() {
8896
R.id.busPost -> {
8997
BusUtils.post(TAG_BUS, TAG_BUS)
9098
}
99+
R.id.busPostBasicType -> {
100+
BusUtils.post(TAG_BASIC_TYPE, Random(System.currentTimeMillis()).nextInt())
101+
}
91102
R.id.busPostSticky -> {
92103
BusUtils.postSticky(TAG_STICKY_BUS, object : Callback {
93104
override fun call(): String {

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

Lines changed: 34 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,11 @@ import android.os.Bundle
99
import android.support.annotation.StringRes
1010
import android.support.v7.widget.LinearLayoutManager
1111
import android.view.View
12-
import android.widget.Button
1312
import android.widget.ImageView
1413
import android.widget.TextView
15-
import com.blankj.base.rv.BaseAdapter
16-
import com.blankj.base.rv.BaseCell
17-
import com.blankj.base.rv.BaseViewHolder
14+
import com.blankj.base.rv.BaseItem
15+
import com.blankj.base.rv.BaseItemAdapter
16+
import com.blankj.base.rv.ItemViewHolder
1817
import com.blankj.common.CommonTaskActivity
1918
import com.blankj.utilcode.pkg.Config
2019
import com.blankj.utilcode.pkg.R
@@ -31,7 +30,7 @@ import kotlinx.android.synthetic.main.activity_image.*
3130
* desc : demo about ImageUtils
3231
* ```
3332
*/
34-
class ImageActivity : CommonTaskActivity<List<BaseCell>>() {
33+
class ImageActivity : CommonTaskActivity<List<ImageCell>>() {
3534

3635
companion object {
3736
fun start(context: Context) {
@@ -42,16 +41,16 @@ class ImageActivity : CommonTaskActivity<List<BaseCell>>() {
4241

4342
private lateinit var src: Bitmap
4443

45-
override fun doInBackground(): List<BaseCell> {
44+
override fun doInBackground(): List<ImageCell> {
4645
src = ImageUtils.getBitmap(R.drawable.image_lena)
4746
val round = ImageUtils.getBitmap(R.drawable.main_avatar_round)
4847
val watermark = ImageUtils.getBitmap(R.mipmap.ic_launcher)
4948

5049
val width = src.width
5150
val height = src.height
5251

53-
return ArrayList<BaseCell>().apply {
54-
add(HeaderCell(src))
52+
return ArrayList<ImageCell>().apply {
53+
add(ImageCell(src))
5554
add(ImageCell(R.string.image_src, src))
5655
add(ImageCell(R.string.image_add_color, ImageUtils.drawColor(src, Color.parseColor("#8000FF00"))))
5756
add(ImageCell(R.string.image_scale, ImageUtils.scale(src, width / 2, height / 2)))
@@ -80,9 +79,10 @@ class ImageActivity : CommonTaskActivity<List<BaseCell>>() {
8079
}
8180
}
8281

83-
override fun runOnUiThread(data: List<BaseCell>) {
84-
val imageAdapter = BaseAdapter<BaseCell>()
85-
imageAdapter.data = data
82+
override fun runOnUiThread(data: List<ImageCell>) {
83+
val imageAdapter = BaseItemAdapter<ImageCell>()
84+
imageAdapter.setHasStableIds(true)
85+
imageAdapter.items = data
8686
imageRv.adapter = imageAdapter
8787
imageRv.layoutManager = LinearLayoutManager(this@ImageActivity)
8888
}
@@ -105,20 +105,33 @@ class ImageActivity : CommonTaskActivity<List<BaseCell>>() {
105105
override fun onDebouncingClick(view: View) {}
106106
}
107107

108-
class ImageCell(@StringRes val resId: Int, private val image: Bitmap) : BaseCell(R.layout.item_image) {
108+
class ImageCell : BaseItem<ImageCell> {
109109

110-
override fun bind(holder: BaseViewHolder, position: Int) {
111-
holder.findViewById<TextView>(R.id.imageItemNameTv).text = StringUtils.getString(resId)
112-
holder.findViewById<ImageView>(R.id.imageItemIv).setImageBitmap(image)
110+
private lateinit var mSrc: Bitmap
111+
private var mResId: Int = 0
112+
private lateinit var mImage: Bitmap
113+
114+
constructor(src: Bitmap) : super(R.layout.item_image_header) {
115+
mSrc = src
113116
}
114-
}
115117

116-
class HeaderCell(private val src: Bitmap) : BaseCell(R.layout.item_image_header) {
118+
constructor(@StringRes resId: Int, image: Bitmap) : super(R.layout.item_image) {
119+
mResId = resId
120+
mImage = image
121+
}
117122

118-
override fun bind(holder: BaseViewHolder, position: Int) {
119-
holder.findViewById<Button>(R.id.imageSaveBtn).setOnClickListener {
120-
val save = ImageUtils.save(src, Config.CACHE_PATH + "lena.jpg", Bitmap.CompressFormat.JPEG)
121-
ToastUtils.showLong(if (save) "successful" else "failed")
123+
override fun bind(holder: ItemViewHolder, position: Int) {
124+
if (isViewType(R.layout.item_image_header)) {
125+
holder.setOnClickListener(R.id.imageSaveBtn) {
126+
val save = ImageUtils.save(mSrc, Config.CACHE_PATH + "lena.jpg", Bitmap.CompressFormat.JPEG)
127+
ToastUtils.showLong(if (save) "successful" else "failed")
128+
}
129+
return
130+
}
131+
if (isViewType(R.layout.item_image)) {
132+
holder.findViewById<TextView>(R.id.imageItemNameTv).text = StringUtils.getString(mResId)
133+
holder.findViewById<ImageView>(R.id.imageItemIv).setImageBitmap(mImage)
134+
return
122135
}
123136
}
124137
}

‎feature/utilcode/pkg/src/main/res/layout/activity_bus.xml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,13 @@
3333
android:layout_height="wrap_content"
3434
android:text="@string/bus_post" />
3535

36+
<Button
37+
android:id="@+id/busPostBasicType"
38+
style="@style/WideBtnStyle"
39+
android:layout_width="match_parent"
40+
android:layout_height="wrap_content"
41+
android:text="@string/bus_post_basic_type" />
42+
3643
<Button
3744
android:id="@+id/busPostSticky"
3845
style="@style/WideBtnStyle"

‎feature/utilcode/pkg/src/main/res/values/strings.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,7 @@
140140
<string name="bus_register">Register</string>
141141
<string name="bus_unregister">Unregister</string>
142142
<string name="bus_post">Post</string>
143+
<string name="bus_post_basic_type">Post Basic Type</string>
143144
<string name="bus_post_sticky">Post Sticky</string>
144145
<string name="bus_post_to_io_thread">Post To IO Thread</string>
145146
<string name="bus_remove_sticky">Remove Sticky</string>

‎lib/base/src/main/java/com/blankj/base/rv/BaseAdapter.java

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

‎lib/base/src/main/java/com/blankj/base/rv/BaseCell.java

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

0 commit comments

Comments
 (0)