Skip to content

Commit e88f6f0

Browse files
committed
封装LiveDataBus
1 parent c8a2544 commit e88f6f0

File tree

4 files changed

+17
-9
lines changed

4 files changed

+17
-9
lines changed

app/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ android {
1414
minSdkVersion 21
1515
targetSdkVersion 29
1616
versionCode 13
17-
versionName "2.7"
17+
versionName "2.8"
1818
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
1919
}
2020
signingConfigs {
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
package com.fmt.github.home.event
22

3-
class ReposStarEvent
3+
class ReposStarEvent(val isFromFavor:Boolean)

app/src/main/java/com/fmt/github/repos/activity/ReposDetailActivity.kt

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ class ReposDetailActivity : BaseVMActivity() {
3030
private lateinit var mOwner: String
3131
private lateinit var mRepos: String
3232
private lateinit var mWebUrl: String
33+
private var mIsFromFavor: Boolean = false
3334

3435
override fun getLayoutId(): Int = R.layout.activity_repos_detail
3536

@@ -103,15 +104,17 @@ class ReposDetailActivity : BaseVMActivity() {
103104
mViewModel.starRepo(mOwner, mRepos)
104105
.observe(this@ReposDetailActivity, {
105106
successToast(getString(R.string.stared))
106-
LiveDataBus.with<ReposStarEvent>(Constant.STAR_EVENT_KEY).postData(ReposStarEvent())
107+
LiveDataBus.with<ReposStarEvent>(Constant.STAR_EVENT_KEY)
108+
.setData(ReposStarEvent(mIsFromFavor))
107109
})
108110
}
109111

110112
private fun unStarRepo() {
111113
mViewModel.unStarRepo(mOwner, mRepos)
112114
.observe(this@ReposDetailActivity, {
113115
successToast(getString(R.string.un_stared))
114-
LiveDataBus.with<ReposStarEvent>(Constant.STAR_EVENT_KEY).postData(ReposStarEvent())
116+
LiveDataBus.with<ReposStarEvent>(Constant.STAR_EVENT_KEY)
117+
.setData(ReposStarEvent(mIsFromFavor))
115118
})
116119
}
117120

@@ -123,7 +126,12 @@ class ReposDetailActivity : BaseVMActivity() {
123126
}
124127
}
125128

126-
fun go2ReposDetailActivity(activity: Activity, webUrl: String, repo: String, owner: String) {
129+
fun go2ReposDetailActivity(
130+
activity: Activity,
131+
webUrl: String,
132+
repo: String,
133+
owner: String,
134+
) {
127135
Bundle().run {
128136
putString(ReposDetailActivity.WEB_URL, webUrl)
129137
putString(ReposDetailActivity.REPO, repo)

app/src/main/java/com/fmt/github/user/fragment/UserReposFragment.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ class UserReposFragment : BaseListMVFragment<ReposItemModel>() {
5050
mActivity,
5151
reposItemModel.html_url,
5252
reposItemModel.name,
53-
reposItemModel.owner.login
53+
reposItemModel.owner.login,
5454
)
5555
}
5656
LastAdapter(mListData, BR.item)
@@ -65,7 +65,7 @@ class UserReposFragment : BaseListMVFragment<ReposItemModel>() {
6565
mUserName = it.getString(KEY).toString()
6666
mIsFavor = it.getBoolean(IS_FAVOR)
6767
initViewModelAction()
68-
if (mIsFavor) initStarEvent()
68+
initStarEvent()
6969
}
7070
}
7171

@@ -77,10 +77,10 @@ class UserReposFragment : BaseListMVFragment<ReposItemModel>() {
7777
}
7878
}
7979

80-
//LiveEventBus实现Android消息总线
80+
//LiveDataBus实现Android消息总线
8181
private fun initStarEvent() {
8282
LiveDataBus.with<ReposStarEvent>(Constant.STAR_EVENT_KEY)
83-
.observe(this, {
83+
.observe(this, { reposStarEvent ->
8484
onRefresh(mRefreshLayout)
8585
})
8686
}

0 commit comments

Comments
 (0)