Skip to content

Commit 5de1423

Browse files
iceCola7iceCola7
committed
fix
1 parent dd5d998 commit 5de1423

11 files changed

Lines changed: 41 additions & 77 deletions

File tree

‎app/src/main/java/com/cxz/wanandroid/adapter/NavigationAdapter.kt‎

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,12 @@ package com.cxz.wanandroid.adapter
22

33
import android.app.ActivityOptions
44
import android.content.Context
5-
import android.content.Intent
65
import android.view.LayoutInflater
76
import android.view.View
87
import android.widget.TextView
98
import com.chad.library.adapter.base.BaseQuickAdapter
109
import com.chad.library.adapter.base.BaseViewHolder
1110
import com.cxz.wanandroid.R
12-
import com.cxz.wanandroid.constant.Constant
1311
import com.cxz.wanandroid.mvp.model.bean.Article
1412
import com.cxz.wanandroid.mvp.model.bean.NavigationBean
1513
import com.cxz.wanandroid.ui.activity.ContentActivity
@@ -39,7 +37,7 @@ class NavigationAdapter(context: Context?, datas: MutableList<NavigationBean>)
3937

4038
article ?: return null
4139

42-
val padding: Int = DisplayManager.dip2px(10F)!!
40+
val padding: Int = DisplayManager.dip2px(10F)
4341
tv.setPadding(padding, padding, padding, padding)
4442
tv.text = article.title
4543
tv.setTextColor(CommonUtil.randomColor())
@@ -50,13 +48,8 @@ class NavigationAdapter(context: Context?, datas: MutableList<NavigationBean>)
5048
view.height / 2,
5149
0,
5250
0)
53-
var data: Article = articles[position]
54-
Intent(context, ContentActivity::class.java).run {
55-
putExtra(Constant.CONTENT_URL_KEY, data.link)
56-
putExtra(Constant.CONTENT_TITLE_KEY, data.title)
57-
putExtra(Constant.CONTENT_ID_KEY, data.id)
58-
context.startActivity(this, options.toBundle())
59-
}
51+
val data: Article = articles[position]
52+
ContentActivity.start(context, data.id, data.title, data.link, options.toBundle())
6053
true
6154
}
6255
return tv

‎app/src/main/java/com/cxz/wanandroid/ui/activity/ContentActivity.kt‎

Lines changed: 22 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
package com.cxz.wanandroid.ui.activity
22

3+
import android.content.Context
34
import android.content.Intent
45
import android.net.Uri
56
import android.os.Build
7+
import android.os.Bundle
68
import android.support.design.widget.AppBarLayout
79
import android.support.design.widget.CoordinatorLayout
810
import android.view.KeyEvent
@@ -35,6 +37,23 @@ class ContentActivity : BaseMvpSwipeBackActivity<ContentContract.View, ContentCo
3537
private var shareUrl: String = ""
3638
private var shareId: Int = -1
3739

40+
companion object {
41+
42+
fun start(context: Context?, id: Int, title: String, url: String, bundle: Bundle? = null) {
43+
Intent(context, ContentActivity::class.java).run {
44+
putExtra(Constant.CONTENT_ID_KEY, id)
45+
putExtra(Constant.CONTENT_TITLE_KEY, title)
46+
putExtra(Constant.CONTENT_URL_KEY, url)
47+
context?.startActivity(this, bundle)
48+
}
49+
}
50+
51+
fun start(context: Context?, url: String) {
52+
start(context, -1, "", url)
53+
}
54+
55+
}
56+
3857
override fun createPresenter(): ContentContract.Presenter = ContentPresenter()
3958

4059
override fun attachLayoutRes(): Int = R.layout.activity_content
@@ -137,19 +156,18 @@ class ContentActivity : BaseMvpSwipeBackActivity<ContentContract.View, ContentCo
137156
R.id.action_share -> {
138157
Intent().run {
139158
action = Intent.ACTION_SEND
140-
putExtra(
141-
Intent.EXTRA_TEXT, getString(
159+
putExtra(Intent.EXTRA_TEXT, getString(
142160
R.string.share_article_url,
143161
getString(R.string.app_name), shareTitle, shareUrl
144-
)
145-
)
162+
))
146163
type = Constant.CONTENT_SHARE_TYPE
147164
startActivity(Intent.createChooser(this, getString(R.string.action_share)))
148165
}
149166
return true
150167
}
151168
R.id.action_like -> {
152169
if (isLogin) {
170+
if (shareId == -1) return true
153171
mPresenter?.addCollectArticle(shareId)
154172
} else {
155173
Intent(this, LoginActivity::class.java).run {
@@ -167,7 +185,6 @@ class ContentActivity : BaseMvpSwipeBackActivity<ContentContract.View, ContentCo
167185
}
168186
return true
169187
}
170-
171188
}
172189
return super.onOptionsItemSelected(item)
173190
}

‎app/src/main/java/com/cxz/wanandroid/ui/activity/ScoreActivity.kt‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package com.cxz.wanandroid.ui.activity
22

3-
import android.content.Intent
43
import android.support.design.widget.AppBarLayout
54
import android.support.v4.widget.SwipeRefreshLayout
65
import android.support.v7.widget.DefaultItemAnimator
@@ -12,7 +11,6 @@ import com.cxz.wanandroid.R
1211
import com.cxz.wanandroid.adapter.ScoreAdapter
1312
import com.cxz.wanandroid.app.App
1413
import com.cxz.wanandroid.base.BaseMvpSwipeBackActivity
15-
import com.cxz.wanandroid.constant.Constant
1614
import com.cxz.wanandroid.mvp.contract.ScoreContract
1715
import com.cxz.wanandroid.mvp.model.bean.BaseListResponseBody
1816
import com.cxz.wanandroid.mvp.model.bean.UserScoreBean
@@ -175,12 +173,7 @@ class ScoreActivity : BaseMvpSwipeBackActivity<ScoreContract.View, ScoreContract
175173
when (item?.itemId) {
176174
R.id.action_help -> {
177175
val url = "https://www.wanandroid.com/blog/show/2653"
178-
Intent(this@ScoreActivity, ContentActivity::class.java).run {
179-
putExtra(Constant.CONTENT_URL_KEY, url)
180-
putExtra(Constant.CONTENT_TITLE_KEY, "")
181-
putExtra(Constant.CONTENT_ID_KEY, "2653")
182-
startActivity(this)
183-
}
176+
ContentActivity.start(this@ScoreActivity, 2653, "", url)
184177
return true
185178
}
186179
}

‎app/src/main/java/com/cxz/wanandroid/ui/activity/ShareActivity.kt‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -196,12 +196,7 @@ class ShareActivity : BaseMvpSwipeBackActivity<ShareContract.View, SharePresente
196196
val data = datas[position]
197197
when (view.id) {
198198
R.id.rl_content -> {
199-
Intent(this, ContentActivity::class.java).run {
200-
putExtra(Constant.CONTENT_URL_KEY, data.link)
201-
putExtra(Constant.CONTENT_TITLE_KEY, data.title)
202-
putExtra(Constant.CONTENT_ID_KEY, data.id)
203-
startActivity(this)
204-
}
199+
ContentActivity.start(this, data.id, data.title, data.link)
205200
}
206201
R.id.iv_like -> {
207202
if (isLogin) {

‎app/src/main/java/com/cxz/wanandroid/ui/fragment/CollectFragment.kt‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
11
package com.cxz.wanandroid.ui.fragment
22

3-
import android.content.Intent
43
import android.content.res.ColorStateList
54
import android.os.Bundle
65
import android.view.View
76
import com.chad.library.adapter.base.BaseQuickAdapter
87
import com.cxz.wanandroid.R
98
import com.cxz.wanandroid.adapter.CollectAdapter
109
import com.cxz.wanandroid.base.BaseMvpListFragment
11-
import com.cxz.wanandroid.constant.Constant
1210
import com.cxz.wanandroid.event.ColorEvent
1311
import com.cxz.wanandroid.event.RefreshHomeEvent
1412
import com.cxz.wanandroid.ext.showToast
@@ -156,12 +154,7 @@ class CollectFragment : BaseMvpListFragment<CollectContract.View, CollectContrac
156154
private val onItemClickListener = BaseQuickAdapter.OnItemClickListener { _, _, position ->
157155
if (datas.size != 0) {
158156
val data = datas[position]
159-
Intent(activity, ContentActivity::class.java).run {
160-
putExtra(Constant.CONTENT_URL_KEY, data.link)
161-
putExtra(Constant.CONTENT_TITLE_KEY, data.title)
162-
putExtra(Constant.CONTENT_ID_KEY, data.id)
163-
startActivity(this)
164-
}
157+
ContentActivity.start(activity, data.id, data.title, data.link)
165158
}
166159
}
167160

‎app/src/main/java/com/cxz/wanandroid/ui/fragment/HomeFragment.kt‎

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import com.cxz.wanandroid.R
1212
import com.cxz.wanandroid.adapter.HomeAdapter
1313
import com.cxz.wanandroid.app.App
1414
import com.cxz.wanandroid.base.BaseMvpFragment
15-
import com.cxz.wanandroid.constant.Constant
1615
import com.cxz.wanandroid.ext.showSnackMsg
1716
import com.cxz.wanandroid.ext.showToast
1817
import com.cxz.wanandroid.mvp.contract.HomeContract
@@ -237,12 +236,7 @@ class HomeFragment : BaseMvpFragment<HomeContract.View, HomeContract.Presenter>(
237236
private val onItemClickListener = BaseQuickAdapter.OnItemClickListener { _, _, position ->
238237
if (datas.size != 0) {
239238
val data = datas[position]
240-
Intent(activity, ContentActivity::class.java).run {
241-
putExtra(Constant.CONTENT_URL_KEY, data.link)
242-
putExtra(Constant.CONTENT_TITLE_KEY, data.title)
243-
putExtra(Constant.CONTENT_ID_KEY, data.id)
244-
startActivity(this)
245-
}
239+
ContentActivity.start(activity, data.id, data.title, data.link)
246240
}
247241
}
248242

@@ -252,12 +246,7 @@ class HomeFragment : BaseMvpFragment<HomeContract.View, HomeContract.Presenter>(
252246
private val bannerDelegate = BGABanner.Delegate<ImageView, String> { banner, imageView, model, position ->
253247
if (bannerDatas.size > 0) {
254248
val data = bannerDatas[position]
255-
Intent(activity, ContentActivity::class.java).run {
256-
putExtra(Constant.CONTENT_URL_KEY, data.url)
257-
putExtra(Constant.CONTENT_TITLE_KEY, data.title)
258-
putExtra(Constant.CONTENT_ID_KEY, data.id)
259-
startActivity(this)
260-
}
249+
ContentActivity.start(activity, data.id, data.title, data.url)
261250
}
262251
}
263252

‎app/src/main/java/com/cxz/wanandroid/ui/fragment/KnowledgeFragment.kt‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -171,12 +171,7 @@ class KnowledgeFragment : BaseMvpListFragment<KnowledgeContract.View, KnowledgeC
171171
private val onItemClickListener = BaseQuickAdapter.OnItemClickListener { _, _, position ->
172172
if (datas.size != 0) {
173173
val data = datas[position]
174-
Intent(activity, ContentActivity::class.java).run {
175-
putExtra(Constant.CONTENT_URL_KEY, data.link)
176-
putExtra(Constant.CONTENT_TITLE_KEY, data.title)
177-
putExtra(Constant.CONTENT_ID_KEY, data.id)
178-
startActivity(this)
179-
}
174+
ContentActivity.start(activity, data.id, data.title, data.link)
180175
}
181176
}
182177

‎app/src/main/java/com/cxz/wanandroid/ui/fragment/ProjectListFragment.kt‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -154,12 +154,7 @@ class ProjectListFragment : BaseMvpListFragment<ProjectListContract.View, Projec
154154
private val onItemClickListener = BaseQuickAdapter.OnItemClickListener { _, _, position ->
155155
if (datas.size != 0) {
156156
val data = datas[position]
157-
Intent(activity, ContentActivity::class.java).run {
158-
putExtra(Constant.CONTENT_URL_KEY, data.link)
159-
putExtra(Constant.CONTENT_TITLE_KEY, data.title)
160-
putExtra(Constant.CONTENT_ID_KEY, data.id)
161-
startActivity(this)
162-
}
157+
163158
}
164159
}
165160

‎app/src/main/java/com/cxz/wanandroid/ui/fragment/SearchListFragment.kt‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -165,12 +165,7 @@ class SearchListFragment : BaseMvpListFragment<SearchListContract.View, SearchLi
165165
private val onItemClickListener = BaseQuickAdapter.OnItemClickListener { _, _, position ->
166166
if (datas.size != 0) {
167167
val data = datas[position]
168-
Intent(activity, ContentActivity::class.java).run {
169-
putExtra(Constant.CONTENT_URL_KEY, data.link)
170-
putExtra(Constant.CONTENT_TITLE_KEY, data.title)
171-
putExtra(Constant.CONTENT_ID_KEY, data.id)
172-
startActivity(this)
173-
}
168+
ContentActivity.start(activity, data.id, data.title, data.link)
174169
}
175170
}
176171

‎app/src/main/java/com/cxz/wanandroid/ui/fragment/SquareFragment.kt‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -169,12 +169,7 @@ class SquareFragment : BaseMvpListFragment<SquareContract.View, SquarePresenter>
169169
private val onItemClickListener = BaseQuickAdapter.OnItemClickListener { _, _, position ->
170170
if (datas.size != 0) {
171171
val data = datas[position]
172-
Intent(activity, ContentActivity::class.java).run {
173-
putExtra(Constant.CONTENT_URL_KEY, data.link)
174-
putExtra(Constant.CONTENT_TITLE_KEY, data.title)
175-
putExtra(Constant.CONTENT_ID_KEY, data.id)
176-
startActivity(this)
177-
}
172+
ContentActivity.start(activity, data.id, data.title, data.link)
178173
}
179174
}
180175

0 commit comments

Comments
 (0)