Commit 1c40e8cb by 刘鹏

feat: 测评会员接口不带api接口调试完毕,不传uid不好使,接口有问题

parent 2bce871a
package com.yidianling.user.bean package com.yidianling.user.bean
data class EffectivityBean( data class EffectivityBean(
//1.测评在会员权益并生效中,2.该会员没有对应权益,3.权益过期
val isEffect: Int, val isEffect: Int,
//0.下架,1.上架
val status: Int, val status: Int,
//权益包名称
val packageName: String, val packageName: String,
//权益包id
val packageId: Int, val packageId: Int,
//到期时间
val overdue: String val overdue: String
) )
\ No newline at end of file
...@@ -29,7 +29,6 @@ import com.ydl.ydlcommon.utils.YdlBuryPointUtil ...@@ -29,7 +29,6 @@ import com.ydl.ydlcommon.utils.YdlBuryPointUtil
import com.ydl.ydlcommon.utils.actionutil.ActionCountUtils.Companion.count import com.ydl.ydlcommon.utils.actionutil.ActionCountUtils.Companion.count
import com.ydl.ydlcommon.view.dialog.YDLShareDialog import com.ydl.ydlcommon.view.dialog.YDLShareDialog
import com.ydl.ydlcommon.view.dialog.YDLShareDialog.Companion.style4 import com.ydl.ydlcommon.view.dialog.YDLShareDialog.Companion.style4
import com.yidianling.consultant.api.IConsultantService
import com.yidianling.dynamic.api.IDynamicService import com.yidianling.dynamic.api.IDynamicService
import com.yidianling.im.api.service.IImService import com.yidianling.im.api.service.IImService
import com.yidianling.im.message.param.MsgListParam import com.yidianling.im.message.param.MsgListParam
...@@ -54,7 +53,6 @@ import io.reactivex.android.schedulers.AndroidSchedulers ...@@ -54,7 +53,6 @@ import io.reactivex.android.schedulers.AndroidSchedulers
import io.reactivex.functions.Consumer import io.reactivex.functions.Consumer
import io.reactivex.schedulers.Schedulers import io.reactivex.schedulers.Schedulers
import kotlinx.android.synthetic.main.user_mine_fragment_mine.* import kotlinx.android.synthetic.main.user_mine_fragment_mine.*
import java.util.*
/** /**
* 我的Tab * 我的Tab
...@@ -194,6 +192,7 @@ class MineFragment : BaseFragment(), SwipeRefreshLayout.OnRefreshListener, View. ...@@ -194,6 +192,7 @@ class MineFragment : BaseFragment(), SwipeRefreshLayout.OnRefreshListener, View.
refreshCouponData() refreshCouponData()
} }
@SuppressLint("CheckResult")
private fun getConfideOrder(uid: String) { private fun getConfideOrder(uid: String) {
MineHttpImpl.getInstance().getHasConfideOrder(uid) MineHttpImpl.getInstance().getHasConfideOrder(uid)
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
...@@ -267,7 +266,37 @@ class MineFragment : BaseFragment(), SwipeRefreshLayout.OnRefreshListener, View. ...@@ -267,7 +266,37 @@ class MineFragment : BaseFragment(), SwipeRefreshLayout.OnRefreshListener, View.
} }
} }
MineHttpImpl.getInstance().effectivity()
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe ({ response ->
if ("200" == response.code){
val data = response.data
if (data.isNotEmpty()) {
val effectivityBean = data[0]
if (effectivityBean.status == 1) {
//上架
me_card_vip.visibility = View.VISIBLE
if (effectivityBean.isEffect == 1){
me_vip_des.text = "${effectivityBean.packageName } 有效期至${effectivityBean.overdue}"
tv_open_vip.text ="查看详情"
}else{
me_vip_des.text = "您当前不是会员,开通立享会员特权"
tv_open_vip.text ="开通会员"
}
} else {
//下架
me_card_vip.visibility = View.GONE
}
} else {
me_card_vip.visibility = View.GONE
}
}else{
me_card_vip.visibility = View.GONE
}
}, {
me_card_vip.visibility = View.GONE
})
} }
/** /**
......
...@@ -110,7 +110,7 @@ interface MineApi { ...@@ -110,7 +110,7 @@ interface MineApi {
* 检查该用户是否是会员 * 检查该用户是否是会员
*/ */
@GET("marketing/equity/effectivity") @GET("marketing/equity/effectivity")
@Headers(YDL_DOMAIN + YDL_DOMAIN) @Headers(YDL_DOMAIN + YDL_DOMAIN_JAVA)
fun effectivity(): Observable<BaseAPIResponse<MutableList<EffectivityBean>>> fun effectivity(): Observable<BaseAPIResponse<MutableList<EffectivityBean>>>
} }
\ No newline at end of file
...@@ -545,6 +545,7 @@ ...@@ -545,6 +545,7 @@
android:layout_marginStart="16dp" android:layout_marginStart="16dp"
android:layout_marginTop="20dp" android:layout_marginTop="20dp"
android:layout_marginEnd="14dp" android:layout_marginEnd="14dp"
android:visibility="gone"
app:cardCornerRadius="8dp"> app:cardCornerRadius="8dp">
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout
...@@ -578,16 +579,21 @@ ...@@ -578,16 +579,21 @@
<TextView <TextView
android:id="@+id/me_vip_des" android:id="@+id/me_vip_des"
android:layout_width="wrap_content" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
android:text="您当前不是会员,开通立享会员特权" android:text="您当前不是会员,开通立享会员特权"
android:textSize="12sp" android:textSize="12sp"
android:maxLines="1"
android:ellipsize="end"
android:gravity="left"
app:layout_constraintRight_toLeftOf="@id/ll_open_vip"
android:textColor="@color/platform_color_999999" android:textColor="@color/platform_color_999999"
app:layout_constraintLeft_toLeftOf="@id/me_vip_center" app:layout_constraintLeft_toLeftOf="@id/me_vip_center"
app:layout_constraintTop_toBottomOf="@id/me_vip_center" /> app:layout_constraintTop_toBottomOf="@id/me_vip_center" />
<LinearLayout <LinearLayout
android:id="@+id/ll_open_vip"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@drawable/user_shape_bg_ffc57d_ffb95f" android:background="@drawable/user_shape_bg_ffc57d_ffb95f"
...@@ -602,6 +608,7 @@ ...@@ -602,6 +608,7 @@
app:layout_constraintTop_toTopOf="parent"> app:layout_constraintTop_toTopOf="parent">
<TextView <TextView
android:id="@+id/tv_open_vip"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="开通会员" android:text="开通会员"
......
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