Skip to content

Y
YDL-Component-Medical
Commit 2bce871a by 刘鹏
Options

feat: 测评会员

parent e0af8ed2
Showing with 125 additions and 4 deletions
app/src/main/java/com/ydl/component/base/DemoGlobalConfig.java
......@@ -20,8 +20,8 @@ import java.util.List;
*/
public final class DemoGlobalConfig implements IConfigModule {
String APP_DOMAIN = "https://api.github.com/";
// public static String appEnv = YDLConstants.ENV_TEST;
public static String appEnv = YDLConstants.ENV_PROD;
public static String appEnv = YDLConstants.ENV_TEST;
// public static String appEnv = YDLConstants.ENV_PROD;
// public static String appEnv = YDLConstants.ENV_NEW_TEST;//配置未上传到maven库
@Override
......
config.gradle
ext {
dev_mode = false//组件发布的时候需要设置为false
dev_mode = true//组件发布的时候需要设置为false
ydl2PublishVersion = "0.2.0.17"
ydlPublishVersion = [
// -------------- 业务模块 --------------
......
m-user/src/main/java/com/yidianling/user/bean/EffectivityBean.kt 0 → 100644
package com.yidianling.user.bean
data class EffectivityBean(
val isEffect: Int,
val status: Int,
val packageName: String,
val packageId: Int,
val overdue: String
)
\ No newline at end of file
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)
init()
GlideApp.with(this).load("https://static.yidianling.com/banner/bottombanner@2x.png")
......@@ -265,6 +266,8 @@ class MineFragment : BaseFragment(), SwipeRefreshLayout.OnRefreshListener, View.
getLocal().setCoupon(false)
}
}
}
/**
......@@ -546,6 +549,16 @@ class MineFragment : BaseFragment(), SwipeRefreshLayout.OnRefreshListener, View.
NewH5Activity.start(it, h5Params3)
}
} else if (id == R.id.me_card_vip) { //vip
// count(UserMyPageEvent.YDL_USER_MY_MIDDLE_TYPE_CLICK, "冥想")
mActivity?.let {
if (!startLoginByStatus(it, true)) {
return
}
val h5Params3 = H5Params(MH5_URL + "ceshi/vip/detail", null)
NewH5Activity.start(it, h5Params3)
}
}
}
......@@ -588,6 +601,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("marketing/equity/effectivity")
@Headers(YDL_DOMAIN + YDL_DOMAIN)
fun effectivity(): Observable<BaseAPIResponse<MutableList<EffectivityBean>>>
}
\ No newline at end of file
m-user/src/main/java/com/yidianling/user/mine/http/MineHttp.kt
......@@ -8,6 +8,7 @@ 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.mine.bean.AccountBean
......@@ -49,5 +50,6 @@ interface MineHttp {
fun getSysMsgList(param: MsgListParam): Observable<BaseResponse<String>>
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/me_icon_vip_bg.xml 0 → 100644
<vector xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:aapt="http://schemas.android.com/aapt"
android:width="381dp"
android:height="68dp"
android:viewportWidth="381"
android:viewportHeight="68">
<path
android:pathData="M8,0L373,0A8,8 0,0 1,381 8L381,60A8,8 0,0 1,373 68L8,68A8,8 0,0 1,0 60L0,8A8,8 0,0 1,8 0z"
android:strokeWidth="1"
android:fillType="evenOdd"
android:strokeColor="#00000000">
<aapt:attr name="android:fillColor">
<gradient
android:startY="33.776176"
android:startX="-15.267498"
android:endY="34"
android:endX="381"
android:type="linear">
<item android:offset="0" android:color="#FFFFF2DD"/>
<item android:offset="1" android:color="#FFFFDCB0"/>
</gradient>
</aapt:attr>
</path>
<group>
<clip-path
android:pathData="M10.815,-9.731L370.269,53.651A8,8 63.092,0 1,376.759 62.919L367.729,114.129A8,8 64.951,0 1,358.461 120.618L-0.993,57.236A8,8 133.569,0 1,-7.483 47.969L1.547,-3.241A8,8 0,0 1,10.815 -9.731z"/>
<path
android:pathData="M-7.365,-1.543a45,73.5 100,1 0,144.767 25.526a45,73.5 100,1 0,-144.767 -25.526z"
android:strokeWidth="1"
android:fillType="evenOdd"
android:strokeColor="#00000000">
<aapt:attr name="android:fillColor">
<gradient
android:startY="11.219515"
android:startX="-9.066536"
android:endY="8.540979"
android:endX="362.5162"
android:type="linear">
<item android:offset="0" android:color="#FFFFE7C5"/>
<item android:offset="1" android:color="#FFFFE5C2"/>
</gradient>
</aapt:attr>
</path>
</group>
<group>
<clip-path
android:pathData="M571.695,-151.042L255.596,31.458A8,8 61.114,0 0,252.667 42.387L278.668,87.42A8,8 92.896,0 0,289.596 90.348L605.695,-92.152A8,8 71.873,0 0,608.623 -103.08L582.623,-148.113A8,8 78.945,0 0,571.695 -151.042z"/>
<path
android:pathData="M390.171,-1.539a66,80.5 60,1 1,-139.43 80.5a66,80.5 60,1 1,139.43 -80.5z"
android:strokeWidth="1"
android:fillType="evenOdd"
android:strokeColor="#00000000">
<aapt:attr name="android:fillColor">
<gradient
android:startY="38.711132"
android:startX="241.60858"
android:endY="49.94502"
android:endX="389.86444"
android:type="linear">
<item android:offset="0" android:color="#FFFFCD90"/>
<item android:offset="1" android:color="#FFFFE5C2"/>
</gradient>
</aapt:attr>
</path>
</group>
</vector>
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
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