Skip to content

Y
YDL-Component-Medical
Commit b530ece9 by 刘鹏
Options

Merge branch 'feat/lp/lp_test_vip' into 'd/v4.4.07' 

测评会员代码合并

See merge request app_android_lib/YDL-Component!296
parents 25924372 2af5a191
Showing with 262 additions and 64 deletions
build.gradle
......@@ -14,7 +14,7 @@ buildscript {
ydlrouter_version = '1.2.3'
constrait_support_version = '1.0.2'
componentVersion = "0.3.0.18"
componentVersion = "0.3.0.12"
}
repositories {
mavenCentral()
......
m-user/src/main/java/com/yidianling/user/bean/EffectivityBean.kt 0 → 100644
package com.yidianling.user.bean
data class EffectivityBean(
//1.测评在会员权益并生效中，2.该会员没有对应权益，3.权益过期
val isEffect: Int,
//0.下架，1.上架
val status: Int,
//权益包名称
val packageName: String,
//权益包id
val packageId: Int,
//到期时间
val overdue: String
)
\ No newline at end of file
m-user/src/main/java/com/yidianling/user/constants/UserBIConstants.kt
......@@ -92,6 +92,8 @@ class UserMyPageEvent{
const val YDL_USER_MY_PAGE_STAY_VISIT=YDL_USER_MY_PAGE+"YDL_USER_MY_PAGE_STAY_VISIT"
const val YDL_USER_MY_TOP_TYPE_CLICK= YDL_USER_MY_PAGE+"ydl_user_my_top_type_click"
const val YDL_USER_MY_MIDDLE_TYPE_CLICK= YDL_USER_MY_PAGE+"ydl_user_my_middle_type_click"
//app我的页_会员中心区域点击
const val YDL_USER_MY_MEMBER_CENTRE_CLICK = YDL_USER_MY_PAGE + "member_centre_click"
const val YDL_USER_MY_BOTTOM_TYPE_CLICK= YDL_USER_MY_PAGE+"ydl_user_my_bottom_type_click"
}
}
......
m-user/src/main/java/com/yidianling/user/mine/MineFragment.kt
......@@ -118,6 +118,7 @@ class MineFragment : BaseFragment(), SwipeRefreshLayout.OnRefreshListener, View.
rootView.findViewById<View>(R.id.ll_service).setOnClickListener(this)
//冥想
rootView.findViewById<View>(R.id.ll_meditation).setOnClickListener(this)
rootView.findViewById<View>(R.id.me_card_vip).setOnClickListener(this)
//心理百科
rootView.findViewById<View>(R.id.ll_wiki).setOnClickListener(this)
......@@ -276,6 +277,34 @@ class MineFragment : BaseFragment(), SwipeRefreshLayout.OnRefreshListener, View.
getLocal().setCoupon(false)
}
}
MineHttpImpl.getInstance().effectivity()
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe ({ response ->
if ("200" == response.code && response.data.isNotEmpty()) {
val effectivityBean = response.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
}
}, {
me_card_vip.visibility = View.GONE
})
}
/**
......@@ -564,6 +593,19 @@ class MineFragment : BaseFragment(), SwipeRefreshLayout.OnRefreshListener, View.
NewH5Activity.start(it, h5Params3)
}
} else if (id == R.id.me_card_vip) {
count(UserMyPageEvent.YDL_USER_MY_MEMBER_CENTRE_CLICK)
//测评vip
mActivity?.let {
if (!startLoginByStatus(it, true)) {
return
}
mActivity?.let {
val h5Params3 = H5Params(MH5_URL + "ceshi/vip/detail", null)
NewH5Activity.start(it, h5Params3)
}
}
}
}
......@@ -606,6 +648,7 @@ class MineFragment : BaseFragment(), SwipeRefreshLayout.OnRefreshListener, View.
val changeFlag = event.isChange_flag
if (changeFlag) {
initdata()
refreshCouponData()
try {
provide(
IImService::class.java
......
m-user/src/main/java/com/yidianling/user/mine/http/MineApi.kt
......@@ -6,6 +6,7 @@ import com.ydl.ydlcommon.bean.MustUP
import com.ydl.ydlcommon.data.http.BaseAPIResponse
import com.ydl.ydlcommon.data.http.BaseResponse
import com.yidianling.user.api.bean.UserResponseBean
import com.yidianling.user.bean.EffectivityBean
import com.yidianling.user.bean.EvaluateOrderBean
import com.yidianling.user.bean.FundData
import com.yidianling.user.bean.Recharge
......@@ -104,4 +105,12 @@ interface MineApi {
@Headers(YDL_DOMAIN + YDL_DOMAIN_JAVA)
fun hasConfideOrder(@Body body: RequestBody):Observable<BaseAPIResponse<EvaluateOrderBean>>
/**
* 检查该用户是否是会员
*/
@GET("user/equity/effectivity")
@Headers(YDL_DOMAIN + YDL_DOMAIN_JAVA)
fun effectivity(): Observable<BaseAPIResponse<MutableList<EffectivityBean>>>
}
\ No newline at end of file
m-user/src/main/java/com/yidianling/user/mine/http/MineHttp.kt
......@@ -5,11 +5,15 @@ import com.ydl.ydlcommon.data.http.BaseAPIResponse
import com.ydl.ydlcommon.data.http.BaseCommand
import com.ydl.ydlcommon.data.http.BaseResponse
import com.yidianling.im.message.param.MsgListParam
import com.yidianling.user.bean.FundData
import com.yidianling.user.bean.Recharge
import com.yidianling.user.api.bean.UserResponseBean
import com.yidianling.user.bean.EffectivityBean
import com.yidianling.user.bean.EvaluateOrderBean
import com.yidianling.user.mine.*
import com.yidianling.user.bean.FundData
import com.yidianling.user.bean.Recharge
import com.yidianling.user.mine.APPWillUpParam
import com.yidianling.user.mine.FeedBackParam
import com.yidianling.user.mine.FundListParam
import com.yidianling.user.mine.RechargeParam
import com.yidianling.user.mine.bean.AccountBean
import com.yidianling.user.mine.bean.BalanceBean
import com.yidianling.user.mine.bean.CouponNumBean
......@@ -50,4 +54,6 @@ interface MineHttp {
fun getHasConfideOrder(uid: String): Observable<BaseAPIResponse<EvaluateOrderBean>>
//获取测评vip数据
fun effectivity(): Observable<BaseAPIResponse<MutableList<EffectivityBean>>>
}
\ No newline at end of file
m-user/src/main/java/com/yidianling/user/mine/http/MineHttpImpl.kt
......@@ -7,6 +7,7 @@ import com.ydl.ydlcommon.utils.NetworkParamsUtils
import com.ydl.ydlnet.YDLHttpUtils
import com.yidianling.im.message.param.MsgListParam
import com.yidianling.user.api.bean.UserResponseBean
import com.yidianling.user.bean.EffectivityBean
import com.yidianling.user.bean.EvaluateOrderBean
import com.yidianling.user.bean.FundData
import com.yidianling.user.bean.Recharge
......@@ -140,6 +141,10 @@ class MineHttpImpl private constructor() : MineHttp {
return getAppApi().hasConfideOrder(body)
}
override fun effectivity(): Observable<BaseAPIResponse<MutableList<EffectivityBean>>> {
return getAppApi().effectivity()
}
object Holder {
val INSTANCE = MineHttpImpl()
}
......
m-user/src/main/res/drawable/user_shape_bg_ffc57d_ffb95f.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<corners android:radius="19dp" />
<gradient
android:endColor="#ffb95f"
android:startColor="#ffc57d"
android:type="linear" />
</shape>
\ No newline at end of file
m-user/src/main/res/layout/user_mine_fragment_mine.xml
......@@ -267,7 +267,6 @@
</RelativeLayout>
<androidx.cardview.widget.CardView
android:layout_width="match_parent"
android:layout_height="wrap_content"
......@@ -280,25 +279,28 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:paddingLeft="20dp"
android:paddingTop="25dp"
android:paddingRight="20dp"
android:paddingBottom="22dp">
android:orientation="vertical">
<LinearLayout
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
android:paddingLeft="20dp"
android:paddingTop="25dp"
android:paddingRight="20dp"
android:paddingBottom="22dp">
<LinearLayout
android:id="@+id/ll_account"
android:layout_width="wrap_content"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="?android:attr/selectableItemBackground"
android:gravity="center_horizontal"
android:orientation="vertical">
android:orientation="vertical"
app:layout_constraintHorizontal_weight="1"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toLeftOf="@id/ll_red_packet"
app:layout_constraintTop_toTopOf="parent">
<ImageView
android:layout_width="25dp"
......@@ -318,10 +320,13 @@
<RelativeLayout
android:id="@+id/ll_red_packet"
android:layout_width="wrap_content"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="?android:attr/selectableItemBackground">
android:background="?android:attr/selectableItemBackground"
app:layout_constraintHorizontal_weight="1"
app:layout_constraintLeft_toRightOf="@id/ll_account"
app:layout_constraintRight_toLeftOf="@id/csl_call_order"
app:layout_constraintTop_toTopOf="@id/ll_account">
<ImageView
android:id="@+id/img_coupon"
......@@ -335,8 +340,8 @@
android:id="@+id/view_new_coupon"
android:layout_width="8dp"
android:layout_height="8dp"
android:layout_alignRight="@+id/img_coupon"
android:layout_marginRight="-2dp"
android:layout_alignEnd="@+id/img_coupon"
android:layout_marginEnd="-2dp"
android:background="@drawable/user_mine_background_red_point_new_coupon"
android:visibility="invisible"
tools:visibility="visible" />
......@@ -354,70 +359,70 @@
</RelativeLayout>
<androidx.constraintlayout.widget.ConstraintLayout
<RelativeLayout
android:id="@+id/csl_call_order"
android:layout_width="wrap_content"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="?android:attr/selectableItemBackground"
android:gravity="center_horizontal"
android:orientation="vertical">
android:orientation="vertical"
app:layout_constraintHorizontal_weight="1"
app:layout_constraintLeft_toRightOf="@id/ll_red_packet"
app:layout_constraintRight_toLeftOf="@id/csl_trade_order"
app:layout_constraintTop_toTopOf="@id/ll_account">
<ImageView
android:id="@+id/iv_confide"
android:layout_width="25dp"
android:layout_height="25dp"
android:layout_centerHorizontal="true"
android:layout_marginTop="3dp"
android:src="@drawable/user_mine_ic_qinshu_record"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
android:src="@drawable/user_mine_ic_qinshu_record" />
<ImageView
android:id="@+id/iv_confide_tip"
android:layout_width="8dp"
android:layout_height="8dp"
android:layout_alignEnd="@+id/iv_confide"
android:layout_marginEnd="-2dp"
android:src="@drawable/user_mine_background_red_point_new_coupon"
android:visibility="gone"
app:layout_constraintCircle="@id/iv_confide"
app:layout_constraintCircleAngle="45"
app:layout_constraintCircleRadius="13dp"
tools:visibility="visible" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/iv_confide"
android:layout_centerHorizontal="true"
android:layout_marginTop="8dp"
android:text="倾诉记录"
android:textColor="@color/platform_color_999999"
android:textSize="12sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/iv_confide" />
android:textSize="12sp" />
</androidx.constraintlayout.widget.ConstraintLayout>
</RelativeLayout>
<androidx.constraintlayout.widget.ConstraintLayout
<RelativeLayout
android:id="@+id/csl_trade_order"
android:layout_width="wrap_content"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="?android:attr/selectableItemBackground"
android:gravity="center_horizontal"
android:orientation="vertical">
app:layout_constraintHorizontal_weight="1"
app:layout_constraintLeft_toRightOf="@id/csl_call_order"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="@id/ll_account">
<ImageView
android:id="@+id/iv_trade_order"
android:layout_width="25dp"
android:layout_height="25dp"
android:layout_centerHorizontal="true"
android:layout_marginTop="3dp"
android:src="@drawable/user_mine_ic_order"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
android:src="@drawable/user_mine_ic_order" />
<TextView
android:id="@+id/iv_order_tip"
android:layout_alignEnd="@+id/iv_trade_order"
android:layout_marginEnd="-2dp"
android:src="@drawable/user_mine_background_red_point_new_coupon"
android:layout_width="12dp"
android:layout_height="12dp"
android:background="@drawable/user_mine_background_red_point_new_coupon"
......@@ -434,31 +439,28 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/iv_trade_order"
android:layout_centerHorizontal="true"
android:layout_marginTop="8dp"
android:text="预约订单"
android:textColor="@color/platform_color_999999"
android:textSize="12sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/iv_trade_order" />
android:textSize="12sp" />
</androidx.constraintlayout.widget.ConstraintLayout>
</RelativeLayout>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="28dp">
<LinearLayout
android:id="@+id/ll_my_courses"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_marginTop="28dp"
android:background="?android:attr/selectableItemBackground"
android:gravity="center_horizontal"
android:orientation="vertical">
android:orientation="vertical"
app:layout_constraintHorizontal_weight="1"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toLeftOf="@id/ll_service"
app:layout_constraintTop_toBottomOf="@id/ll_account">
<ImageView
android:layout_width="25dp"
......@@ -479,10 +481,13 @@
android:id="@+id/ll_service"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="?android:attr/selectableItemBackground"
android:gravity="center_horizontal"
android:orientation="vertical">
android:orientation="vertical"
app:layout_constraintHorizontal_weight="1"
app:layout_constraintLeft_toRightOf="@id/ll_my_courses"
app:layout_constraintRight_toLeftOf="@id/ll_meditation"
app:layout_constraintTop_toTopOf="@id/ll_my_courses">
<ImageView
android:layout_width="25dp"
......@@ -506,7 +511,11 @@
android:layout_weight="1"
android:background="?android:attr/selectableItemBackground"
android:gravity="center_horizontal"
android:orientation="vertical">
android:orientation="vertical"
app:layout_constraintHorizontal_weight="1"
app:layout_constraintLeft_toRightOf="@id/ll_service"
app:layout_constraintRight_toLeftOf="@id/ll_wiki"
app:layout_constraintTop_toTopOf="@id/ll_my_courses">
<ImageView
android:layout_width="25dp"
......@@ -527,10 +536,13 @@
android:id="@+id/ll_wiki"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
app:layout_constraintHorizontal_weight="1"
android:background="?android:attr/selectableItemBackground"
android:gravity="center_horizontal"
android:orientation="vertical">
app:layout_constraintRight_toRightOf="parent"
android:orientation="vertical"
app:layout_constraintLeft_toRightOf="@id/ll_meditation"
app:layout_constraintTop_toTopOf="@id/ll_my_courses">
<ImageView
android:layout_width="25dp"
......@@ -547,9 +559,100 @@
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
</LinearLayout>
</androidx.cardview.widget.CardView>
<androidx.cardview.widget.CardView
android:id="@+id/me_card_vip"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginTop="20dp"
android:layout_marginEnd="14dp"
android:visibility="gone"
tools:visibility="visible"
app:cardCornerRadius="8dp">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingStart="16dp"
android:paddingTop="12dp"
android:background="@drawable/me_icon_vip_bg"
android:paddingEnd="14dp"
android:paddingBottom="12dp">
<TextView
android:id="@+id/me_vip_center"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="会员中心"
android:textColor="#904f00"
android:textStyle="bold"
android:textSize="16sp"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="4dp"
android:src="@drawable/me_icon_vip"
app:layout_constraintBottom_toBottomOf="@id/me_vip_center"
app:layout_constraintLeft_toRightOf="@id/me_vip_center"
app:layout_constraintTop_toTopOf="@id/me_vip_center" />
<TextView
android:id="@+id/me_vip_des"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:text="您当前不是会员，开通立享会员特权"
android:layout_marginRight="4dp"
android:textSize="11sp"
android:gravity="left"
app:layout_constraintRight_toLeftOf="@id/ll_open_vip"
android:textColor="@color/platform_color_999999"
app:layout_constraintLeft_toLeftOf="@id/me_vip_center"
app:layout_constraintTop_toBottomOf="@id/me_vip_center" />
<LinearLayout
android:id="@+id/ll_open_vip"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/user_shape_bg_ffc57d_ffb95f"
android:gravity="center_vertical"
android:orientation="horizontal"
android:paddingLeft="16dp"
android:paddingTop="6dp"
android:paddingEnd="12dp"
android:paddingBottom="6dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent">
<TextView
android:id="@+id/tv_open_vip"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="开通会员"
android:textStyle="bold"
android:textColor="#904f00"
android:textSize="14sp"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<ImageView
android:layout_marginLeft="6dp"
android:src="@drawable/me_icon_open_vip_right"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
</LinearLayout>
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.cardview.widget.CardView>
<androidx.cardview.widget.CardView
......
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