Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
Y
YDL-Component-Medical
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
杨凯
YDL-Component-Medical
Commits
1c40e8cb
Commit
1c40e8cb
authored
Jul 25, 2022
by
刘鹏
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat: 测评会员接口不带api接口调试完毕,不传uid不好使,接口有问题
parent
2bce871a
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
48 additions
and
5 deletions
+48
-5
EffectivityBean.kt
m-user/src/main/java/com/yidianling/user/bean/EffectivityBean.kt
+6
-0
MineFragment.kt
m-user/src/main/java/com/yidianling/user/mine/MineFragment.kt
+32
-3
MineApi.kt
m-user/src/main/java/com/yidianling/user/mine/http/MineApi.kt
+2
-1
user_mine_fragment_mine.xml
m-user/src/main/res/layout/user_mine_fragment_mine.xml
+8
-1
No files found.
m-user/src/main/java/com/yidianling/user/bean/EffectivityBean.kt
View file @
1c40e8cb
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/mine/MineFragment.kt
View file @
1c40e8cb
...
...
@@ -29,7 +29,6 @@ import com.ydl.ydlcommon.utils.YdlBuryPointUtil
import
com.ydl.ydlcommon.utils.actionutil.ActionCountUtils.Companion.count
import
com.ydl.ydlcommon.view.dialog.YDLShareDialog
import
com.ydl.ydlcommon.view.dialog.YDLShareDialog.Companion.style4
import
com.yidianling.consultant.api.IConsultantService
import
com.yidianling.dynamic.api.IDynamicService
import
com.yidianling.im.api.service.IImService
import
com.yidianling.im.message.param.MsgListParam
...
...
@@ -54,7 +53,6 @@ import io.reactivex.android.schedulers.AndroidSchedulers
import
io.reactivex.functions.Consumer
import
io.reactivex.schedulers.Schedulers
import
kotlinx.android.synthetic.main.user_mine_fragment_mine.*
import
java.util.*
/**
* 我的Tab
...
...
@@ -194,6 +192,7 @@ class MineFragment : BaseFragment(), SwipeRefreshLayout.OnRefreshListener, View.
refreshCouponData
()
}
@SuppressLint
(
"CheckResult"
)
private
fun
getConfideOrder
(
uid
:
String
)
{
MineHttpImpl
.
getInstance
().
getHasConfideOrder
(
uid
)
.
subscribeOn
(
Schedulers
.
io
())
...
...
@@ -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
})
}
/**
...
...
m-user/src/main/java/com/yidianling/user/mine/http/MineApi.kt
View file @
1c40e8cb
...
...
@@ -110,7 +110,7 @@ interface MineApi {
* 检查该用户是否是会员
*/
@GET
(
"marketing/equity/effectivity"
)
@Headers
(
YDL_DOMAIN
+
YDL_DOMAIN
)
@Headers
(
YDL_DOMAIN
+
YDL_DOMAIN
_JAVA
)
fun
effectivity
():
Observable
<
BaseAPIResponse
<
MutableList
<
EffectivityBean
>>>
}
\ No newline at end of file
m-user/src/main/res/layout/user_mine_fragment_mine.xml
View file @
1c40e8cb
...
...
@@ -545,6 +545,7 @@
android:layout_marginStart=
"16dp"
android:layout_marginTop=
"20dp"
android:layout_marginEnd=
"14dp"
android:visibility=
"gone"
app:cardCornerRadius=
"8dp"
>
<androidx.constraintlayout.widget.ConstraintLayout
...
...
@@ -578,16 +579,21 @@
<TextView
android:id=
"@+id/me_vip_des"
android:layout_width=
"
wrap_content
"
android:layout_width=
"
0dp
"
android:layout_height=
"wrap_content"
android:layout_marginTop=
"8dp"
android:text=
"您当前不是会员,开通立享会员特权"
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"
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"
...
...
@@ -602,6 +608,7 @@
app:layout_constraintTop_toTopOf=
"parent"
>
<TextView
android:id=
"@+id/tv_open_vip"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:text=
"开通会员"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment