Merge remote-tracking branch 'origin/develop_1.0.8' into develop_1.0.8

# Conflicts:
#	moduleMain/src/main/java/com/zxbw/modulemain/activity/RechargeActivity.kt

cms/src/main/java/com/zxhl/cms/net/api/IHomeApi.kt

@@ -398,5 +398,5 @@ interface IHomeApi {
 
     //获取用户话费券列表
     @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

moduleMain/src/main/java/com/zxbw/modulemain/activity/RechargeActivity.kt

@@ -9,6 +9,7 @@ import com.zxbw.modulemain.presenter.RechargePresenter
 import com.zxbw.modulemain.view.DialogUtils
 import com.zxhl.cms.AppContext
 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.utils.OnRecycleItemClickListener
 import kotlinx.android.synthetic.main.activity_layout_recharge.*
@@ -39,12 +40,12 @@ class RechargeActivity : BaseActivity(), OnRecycleItemClickListener<RightsDetail
     }
 
     override fun init() {
+        val user = SettingPreference.getUserInfoData()
         mPresenter = RechargePresenter(this)
         mAdapter = RechargeAdapter(this, this)
         id_rl_recharge?.layoutManager = GridLayoutManager(this, 3)
         id_rl_recharge?.adapter = mAdapter
-        mPresenter?.getFetchCard()
-        id_tv_select_coupons?.setOnClickListener(this)
+        mPresenter?.getFetchCard(user.nickname)
     }
 
     override fun onItemClick(view: View?, position: Int, data: RightsDetailEntity?) {

moduleMain/src/main/java/com/zxbw/modulemain/contract/RechargeContract.kt

@@ -7,6 +7,7 @@ class RechargeContract {
     }
 
     interface Presenter {
-        fun getFetchCard()
+        fun getFetchCard(phone:String)
+        fun getPayList()
     }
 }
\ No newline at end of file

moduleMain/src/main/java/com/zxbw/modulemain/presenter/RechargePresenter.kt

@@ -4,7 +4,6 @@ import com.zxbw.modulemain.contract.RechargeContract
 import com.zxhl.cms.net.ApiClient
 import com.zxhl.cms.net.RxSchedulers
 import com.zxhl.cms.net.callback.BaseObserver
-import com.zxhl.cms.net.model.qy.RightsDetailEntity
 import com.zxhl.cms.net.model.qy.SkillEntity
 
 class RechargePresenter : RechargeContract.Presenter {
@@ -14,8 +13,8 @@ class RechargePresenter : RechargeContract.Presenter {
     constructor(mView: RechargeContract.View) {
         this.mView = mView
     }
-    override fun getFetchCard() {
-        ApiClient.homeApi.getFetchallCard().compose(RxSchedulers.observableIO2Main())
+    override fun getFetchCard(phone:String) {
+        ApiClient.homeApi.getFetchallCard(phone).compose(RxSchedulers.observableIO2Main())
             .subscribe(object : BaseObserver<List<SkillEntity>>() {
                 override fun onSuccess(result: List<SkillEntity>?) {
                     if (!result.isNullOrEmpty()){
@@ -28,4 +27,8 @@ class RechargePresenter : RechargeContract.Presenter {
                 }
             })
     }
+
+    override fun getPayList() {
+
+    }
 }
\ No newline at end of file