Commit d91e42c4 authored by maxiaoliang's avatar maxiaoliang

修改

parent 4838caf3
...@@ -398,5 +398,5 @@ interface IHomeApi { ...@@ -398,5 +398,5 @@ interface IHomeApi {
//获取用户话费券列表 //获取用户话费券列表
@GET(NetConfig.QY.XX_GOODS_FETCHALL_CARD) @GET(NetConfig.QY.XX_GOODS_FETCHALL_CARD)
fun getFetchallCard(): Observable<Response<List<SkillEntity>>> fun getFetchallCard( @Query("phone") phone: String?): Observable<Response<List<SkillEntity>>>
} }
\ No newline at end of file
...@@ -8,6 +8,7 @@ import com.zxbw.modulemain.contract.RechargeContract ...@@ -8,6 +8,7 @@ import com.zxbw.modulemain.contract.RechargeContract
import com.zxbw.modulemain.presenter.RechargePresenter import com.zxbw.modulemain.presenter.RechargePresenter
import com.zxhl.cms.AppContext import com.zxhl.cms.AppContext
import com.zxhl.cms.common.base.BaseActivity import com.zxhl.cms.common.base.BaseActivity
import com.zxhl.cms.net.SettingPreference
import com.zxhl.cms.net.model.qy.RightsDetailEntity import com.zxhl.cms.net.model.qy.RightsDetailEntity
import com.zxhl.cms.utils.OnRecycleItemClickListener import com.zxhl.cms.utils.OnRecycleItemClickListener
import kotlinx.android.synthetic.main.activity_layout_recharge.* import kotlinx.android.synthetic.main.activity_layout_recharge.*
...@@ -31,11 +32,12 @@ class RechargeActivity : BaseActivity(), OnRecycleItemClickListener<RightsDetail ...@@ -31,11 +32,12 @@ class RechargeActivity : BaseActivity(), OnRecycleItemClickListener<RightsDetail
} }
override fun init() { override fun init() {
val user = SettingPreference.getUserInfoData()
mPresenter = RechargePresenter(this) mPresenter = RechargePresenter(this)
mAdapter = RechargeAdapter(this, this) mAdapter = RechargeAdapter(this, this)
id_rl_recharge?.layoutManager = GridLayoutManager(this, 3) id_rl_recharge?.layoutManager = GridLayoutManager(this, 3)
id_rl_recharge?.adapter = mAdapter id_rl_recharge?.adapter = mAdapter
mPresenter?.getFetchCard() mPresenter?.getFetchCard(user.nickname)
} }
override fun onItemClick(view: View?, position: Int, data: RightsDetailEntity?) { override fun onItemClick(view: View?, position: Int, data: RightsDetailEntity?) {
......
...@@ -7,6 +7,7 @@ class RechargeContract { ...@@ -7,6 +7,7 @@ class RechargeContract {
} }
interface Presenter { interface Presenter {
fun getFetchCard() fun getFetchCard(phone:String)
fun getPayList()
} }
} }
\ No newline at end of file
...@@ -4,7 +4,6 @@ import com.zxbw.modulemain.contract.RechargeContract ...@@ -4,7 +4,6 @@ import com.zxbw.modulemain.contract.RechargeContract
import com.zxhl.cms.net.ApiClient import com.zxhl.cms.net.ApiClient
import com.zxhl.cms.net.RxSchedulers import com.zxhl.cms.net.RxSchedulers
import com.zxhl.cms.net.callback.BaseObserver import com.zxhl.cms.net.callback.BaseObserver
import com.zxhl.cms.net.model.qy.RightsDetailEntity
import com.zxhl.cms.net.model.qy.SkillEntity import com.zxhl.cms.net.model.qy.SkillEntity
class RechargePresenter : RechargeContract.Presenter { class RechargePresenter : RechargeContract.Presenter {
...@@ -14,8 +13,8 @@ class RechargePresenter : RechargeContract.Presenter { ...@@ -14,8 +13,8 @@ class RechargePresenter : RechargeContract.Presenter {
constructor(mView: RechargeContract.View) { constructor(mView: RechargeContract.View) {
this.mView = mView this.mView = mView
} }
override fun getFetchCard() { override fun getFetchCard(phone:String) {
ApiClient.homeApi.getFetchallCard().compose(RxSchedulers.observableIO2Main()) ApiClient.homeApi.getFetchallCard(phone).compose(RxSchedulers.observableIO2Main())
.subscribe(object : BaseObserver<List<SkillEntity>>() { .subscribe(object : BaseObserver<List<SkillEntity>>() {
override fun onSuccess(result: List<SkillEntity>?) { override fun onSuccess(result: List<SkillEntity>?) {
if (!result.isNullOrEmpty()){ if (!result.isNullOrEmpty()){
...@@ -28,4 +27,8 @@ class RechargePresenter : RechargeContract.Presenter { ...@@ -28,4 +27,8 @@ class RechargePresenter : RechargeContract.Presenter {
} }
}) })
} }
override fun getPayList() {
}
} }
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment