Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Sign in / Register
Toggle navigation
L
LuckyFarm
Project
Project
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
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
王雪伟
LuckyFarm
Commits
030cb772
Commit
030cb772
authored
Dec 11, 2020
by
Li
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[李俊岐]修改提现弹窗
parent
d0e9f033
Show whitespace changes
Inline
Side-by-side
Showing
16 changed files
with
256 additions
and
227 deletions
+256
-227
MainDialog.kt
app/src/main/java/com/ym/msdh/game/view/MainDialog.kt
+46
-28
icon_dialog_iknow.png
app/src/main/res/drawable-xhdpi/icon_dialog_iknow.png
+0
-0
icon_dialog_lingzhuanshi.png
app/src/main/res/drawable-xhdpi/icon_dialog_lingzhuanshi.png
+0
-0
icon_dialog_zuanqian.png
app/src/main/res/drawable-xhdpi/icon_dialog_zuanqian.png
+0
-0
dialog_get_water_drop.xml
app/src/main/res/layout/dialog_get_water_drop.xml
+3
-1
dialog_layout_with_draw_success.xml
app/src/main/res/layout/dialog_layout_with_draw_success.xml
+49
-73
item_watering_task.xml
app/src/main/res/layout/item_watering_task.xml
+1
-1
item_with_draw_list.xml
app/src/main/res/layout/item_with_draw_list.xml
+1
-1
unity_static_splash.png
game/src/main/res/drawable/unity_static_splash.png
+0
-0
FilterUtils.kt
library/src/main/java/com/ym/library/utils/FilterUtils.kt
+2
-2
dialog_layout_red_pg_doubled.xml
library/src/main/res/layout/dialog_layout_red_pg_doubled.xml
+1
-1
UserInfoActivity.kt
.../java/com/ym/userinfo/module/activity/UserInfoActivity.kt
+117
-105
icon_user_order.png
userinfo/src/main/res/drawable-xhdpi/icon_user_order.png
+0
-0
user_item_progressbar_bg.xml
userinfo/src/main/res/drawable/user_item_progressbar_bg.xml
+20
-0
user_progressbar_bg.xml
userinfo/src/main/res/drawable/user_progressbar_bg.xml
+4
-4
activity_user_info.xml
userinfo/src/main/res/layout/activity_user_info.xml
+12
-11
No files found.
app/src/main/java/com/ym/msdh/game/view/MainDialog.kt
View file @
030cb772
...
...
@@ -267,11 +267,14 @@ object MainDialog {
val
ivGetDropBg3
=
mDialogView
?.
findViewById
<
ImageView
>(
R
.
id
.
iv_get_drop_bg3
)
val
tvGetDropCount3
=
mDialogView
?.
findViewById
<
TextView
>(
R
.
id
.
tv_get_drop_count3
)
var
tvget
=
mDialogView
?.
findViewById
<
TextView
>(
R
.
id
.
id_tv_gongxi_get
)
val
btn_get_drop_happy_accept
=
mDialogView
.
findViewById
<
ImageView
>(
R
.
id
.
btn_get_drop_happy_accept
)
var
layout_get_water_root
=
mDialogView
?.
findViewById
<
LinearLayout
>(
R
.
id
.
layout_get_water_root
)
val
btn_get_drop_happy_accept
=
mDialogView
.
findViewById
<
ImageView
>(
R
.
id
.
btn_get_drop_happy_accept
)
//3 种子 4 金币 5 加速剂
when
(
type
)
{
1
->
{
tvget
.
text
=
"恭喜获得
种子
"
tvget
.
text
=
"恭喜获得"
llcontent2
.
visibility
=
View
.
GONE
llcontent3
.
visibility
=
View
.
GONE
if
(
result
.
seedList
?.
size
==
1
)
{
...
...
@@ -302,7 +305,7 @@ object MainDialog {
tvGetDropCount
.
text
=
"+${rewardCount}"
}
3
->
{
tvget
.
text
=
"恭喜获得加速
剂
"
tvget
.
text
=
"恭喜获得加速
器
"
ivGetDropBg
.
setImageResource
(
R
.
mipmap
.
icon_speed_water
)
tvGetDropCount
.
text
=
"+${rewardCount}"
}
...
...
@@ -332,6 +335,12 @@ object MainDialog {
if
(!
context
?.
isFinishing
)
{
mDialog
?.
show
()
}
layoutAd
?.
postDelayed
({
if
(
layoutAd
?.
visibility
==
View
.
VISIBLE
)
{
layout_get_water_root
.
gravity
=
Gravity
.
BOTTOM
}
},
500
)
}
//福利中心开宝箱
...
...
@@ -421,8 +430,8 @@ object MainDialog {
id
:
Int
?,
type
:
Int
?,
jine
:
String
?,
isWelfarePage
:
Boolean
,
dialog
:
Dialog
isWelfarePage
:
Boolean
,
dialog
:
Dialog
)
{
if
(
context
==
null
)
{
...
...
@@ -438,18 +447,24 @@ object MainDialog {
Gravity
.
CENTER
)
val
imgtitle
=
mDialogView
?.
findViewById
<
ImageView
>(
R
.
id
.
id_img_title
)
// val imgtitle = mDialogView?.findViewById<ImageView>(R.id.id_img_title)
val
tv_withdraw_title
=
mDialogView
?.
findViewById
<
TextView
>(
R
.
id
.
tv_withdraw_title
)
val
tvcashcontent
=
mDialogView
?.
findViewById
<
TextView
>(
R
.
id
.
id_tv_cash_content
)
val
imggoon
=
mDialogView
?.
findViewById
<
ImageView
>(
R
.
id
.
id_tv_go_on_make_money
)
tv_withdraw_title
.
text
=
title
tvcashcontent
.
text
=
reason
when
(
status
)
{
1
->
{
imgtitle
.
setImageResource
(
R
.
mipmap
.
img_duihuan_success
)
imggoon
.
setImageResource
(
R
.
mipmap
.
img_go_on_make_money
)
//
imgtitle.setImageResource(R.mipmap.img_duihuan_success)
imggoon
.
setImageResource
(
R
.
drawable
.
icon_dialog_zuanqian
)
if
(
type
==
1
)
{
EventUtils
.
onEvent
(
"show_xinshou0.3"
,
"新手0.3"
)
}
else
if
(
type
==
4
)
{
EventUtils
.
onEvent
(
"show_fuli0.3"
,
"福利0.3"
)
}
else
if
(
type
==
7
){
}
else
if
(
type
==
7
)
{
EventUtils
.
onEvent
(
"welfare_withdraw_success_dialog_show"
)
}
else
if
(
type
==
8
)
{
EventUtils
.
onEvent
(
"attendance_withdraw_success_dialog_show"
)
...
...
@@ -457,7 +472,7 @@ object MainDialog {
if
(
id
!=
null
)
{
when
(
id
)
{
1
->
{
Log
.
e
(
"MXL"
,
"show_baicai"
)
Log
.
e
(
"MXL"
,
"show_baicai"
)
EventUtils
.
onEvent
(
"show_baicai"
,
"白菜"
+
jine
)
}
2
->
{
...
...
@@ -474,43 +489,44 @@ object MainDialog {
}
}
2
->
{
imgtitle
.
setImageResource
(
R
.
mipmap
.
img_duihuan_success
)
imggoon
.
setImageResource
(
R
.
mipmap
.
img_go_on_make_money
)
//
imgtitle.setImageResource(R.mipmap.img_duihuan_success)
imggoon
.
setImageResource
(
R
.
drawable
.
icon_dialog_lingzhuanshi
)
// tvtitle.text = title
}
3
->
{
imgtitle
.
setImageResource
(
R
.
mipmap
.
img_wenxin_trip
)
imggoon
.
setImageResource
(
R
.
mipmap
.
img_i_kon
w
)
//
imgtitle.setImageResource(R.mipmap.img_wenxin_trip)
imggoon
.
setImageResource
(
R
.
drawable
.
icon_dialog_ikno
w
)
// tvtitle.text = title
}
4
->
{
imgtitle
.
setImageResource
(
R
.
mipmap
.
img_wenxin_trip
)
imggoon
.
setImageResource
(
R
.
mipmap
.
img_go_get_diamand
)
//
imgtitle.setImageResource(R.mipmap.img_wenxin_trip)
imggoon
.
setImageResource
(
R
.
drawable
.
icon_dialog_lingzhuanshi
)
}
5
->
{
imgtitle
.
setImageResource
(
R
.
mipmap
.
img_wenxin_trip
)
imggoon
.
setImageResource
(
R
.
mipmap
.
img_go_zhongcai
)
//
imgtitle.setImageResource(R.mipmap.img_wenxin_trip)
imggoon
.
setImageResource
(
R
.
drawable
.
icon_dialog_zuanqian
)
}
6
->
{
imgtitle
.
setImageResource
(
R
.
mipmap
.
img_wenxin_trip
)
imggoon
.
setImageResource
(
R
.
mipmap
.
img_go_zhongcai
)
// imgtitle.setImageResource(R.mipmap.img_wenxin_trip)
imggoon
.
setImageResource
(
R
.
drawable
.
icon_dialog_zuanqian
)
}
}
tvcashcontent
.
text
=
reason
imggoon
.
addClickScale
(
)
// imggoon.addClickScale()
FilterUtils
.
addClickAlpha
(
imggoon
)
imggoon
.
setOnClickListener
{
if
(
buttonStatus
==
0
)
{
mDialog
.
dismiss
()
}
else
if
(
buttonStatus
==
1
){
}
else
if
(
buttonStatus
==
1
)
{
mDialog
.
dismiss
()
dialog
.
dismiss
()
if
(!
isWelfarePage
)
{
JumpUtils
.
jumpWelfareActivity
()
}
// JumpUtils.h5Jump("每日福利", Constant.Param.WelfareCenter, false, context as Activity)
}
else
if
(
buttonStatus
==
2
)
{
}
else
if
(
buttonStatus
==
2
)
{
mDialog
.
dismiss
()
dialog
.
dismiss
()
}
...
...
@@ -580,6 +596,7 @@ object MainDialog {
mDialog
?.
show
()
}
}
// 云朵加速的弹窗
fun
showDialogCloud
(
activity
:
Activity
?,
...
...
@@ -600,7 +617,8 @@ object MainDialog {
val
layoutAd
=
mDialogView
?.
findViewById
<
FrameLayout
>(
R
.
id
.
layout_get_drop_ad
)
AdUtils
.
showFeedAd
(
activity
,
"cloud_speed_bigimage"
,
layoutAd
)
mDialogView
.
findViewById
<
TextView
>(
R
.
id
.
id_tv_speed_time
)
?.
text
=
"所有土地获得${speedtime}分钟加速"
mDialogView
.
findViewById
<
TextView
>(
R
.
id
.
id_cloud_speed_num
)
?.
text
=
"每天晚上0点重置视频次数(剩余${speedtimes}次)"
mDialogView
.
findViewById
<
TextView
>(
R
.
id
.
id_cloud_speed_num
)
?.
text
=
"每天晚上0点重置视频次数(剩余${speedtimes}次)"
mDialogView
.
findViewById
<
ImageView
>(
R
.
id
.
id_img_close_cloud_speed
).
setOnClickListener
{
mDialog
.
dismiss
()
}
...
...
@@ -712,7 +730,7 @@ object MainDialog {
})
mDialog
?.
setCanceledOnTouchOutside
(
false
)
mDialog
?.
setCancelable
(
false
)
if
(
activity
.
isFinishing
)
{
if
(
activity
.
isFinishing
)
{
return
}
mDialog
?.
show
()
...
...
app/src/main/res/drawable-xhdpi/icon_dialog_iknow.png
0 → 100644
View file @
030cb772
50.2 KB
app/src/main/res/drawable-xhdpi/icon_dialog_lingzhuanshi.png
0 → 100644
View file @
030cb772
49 KB
app/src/main/res/drawable-xhdpi/icon_dialog_zuanqian.png
0 → 100644
View file @
030cb772
53.5 KB
app/src/main/res/layout/dialog_get_water_drop.xml
View file @
030cb772
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android=
"http://schemas.android.com/apk/res/android"
xmlns:tools=
"http://schemas.android.com/tools"
android:id=
"@+id/layout_get_water_root"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:gravity=
"center"
...
...
@@ -8,7 +9,8 @@
<FrameLayout
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
>
android:layout_height=
"wrap_content"
android:layout_gravity=
"center_horizontal"
>
<RelativeLayout
android:layout_width=
"328dp"
...
...
app/src/main/res/layout/dialog_layout_with_draw_success.xml
View file @
030cb772
<?xml version="1.0" encoding="utf-8"?>
<
Frame
Layout
xmlns:android=
"http://schemas.android.com/apk/res/android"
<
Linear
Layout
xmlns:android=
"http://schemas.android.com/apk/res/android"
xmlns:tools=
"http://schemas.android.com/tools"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
>
<LinearLayout
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:gravity=
"center"
android:orientation=
"vertical"
>
<RelativeLayout
android:layout_width=
"match_parent"
android:layout_height=
"370dp"
android:layout_marginLeft=
"@dimen/dp_15"
android:layout_marginRight=
"@dimen/dp_15"
>
<ImageView
android:layout_width=
"match_parent"
android:layout_height=
"313dp"
android:layout_alignParentBottom=
"true"
android:scaleType=
"fitXY"
android:src=
"@mipmap/icon_main_dialog_get_drops_bg"
/>
<ImageView
android:id=
"@+id/id_img_dialog_close"
<FrameLayout
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_alignParentRight=
"true"
android:layout_marginTop=
"65dp"
android:src=
"@mipmap/icon_new_close"
/>
android:layout_height=
"wrap_content"
>
<RelativeLayout
android:layout_width=
"match_parent"
android:layout_height=
"350dp"
android:layout_alignParentBottom=
"true"
android:layout_marginLeft=
"@dimen/dp_10"
android:layout_marginRight=
"@dimen/dp_10"
android:layout_marginBottom=
"20dp"
android:background=
"@mipmap/icon_content_bg"
>
android:layout_width=
"328dp"
android:layout_height=
"274dp"
android:layout_marginTop=
"6dp"
android:layout_marginRight=
"5dp"
android:background=
"@drawable/icon_base_dialog_bg"
>
<Image
View
android:id=
"@+id/id_img
_title"
<com.ym.library.widget.FontText
View
android:id=
"@+id/tv_withdraw
_title"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_centerHorizontal=
"true"
android:layout_marginTop=
"35dp"
android:src=
"@mipmap/icon_top_bg"
/>
android:layout_marginTop=
"6dp"
android:textColor=
"@color/white"
android:textSize=
"22sp"
/>
<LinearLayout
android:id=
"@+id/id_ll_content"
android:layout_width=
"wrap_content"
android:layout_height=
"150dp"
android:layout_below=
"@+id/id_tv_gongxi_get"
android:layout_centerHorizontal=
"true"
android:layout_marginLeft=
"28dp"
android:layout_marginTop=
"@dimen/dp_121"
android:layout_marginRight=
"@dimen/dp_26"
android:gravity=
"center"
android:orientation=
"horizontal"
android:visibility=
"visible"
>
<TextView
android:id=
"@+id/id_tv_cash_content"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_centerHorizontal=
"true"
android:layout_marginLeft=
"40dp"
android:layout_marginTop=
"97dp"
android:layout_marginRight=
"40dp"
android:gravity=
"center"
android:lineSpacingExtra=
"@dimen/dp_10
"
android:text=
"恭喜您成功兑换0.3元红包,您可以前往微信钱包查看到账情况
"
android:textColor=
"#6A231A
"
android:includeFontPadding=
"false
"
android:lineSpacingExtra=
"5dp
"
android:textColor=
"#095100
"
android:textSize=
"@dimen/sp_17"
android:visibility=
"visible"
/>
</LinearLayout>
android:visibility=
"visible"
tools:text=
"每天只能提现1次哦,您今天已经 提现过了,明天再提现吧~"
/>
<ImageView
android:id=
"@+id/id_tv_go_on_make_money"
...
...
@@ -82,10 +50,18 @@
android:layout_height=
"wrap_content"
android:layout_alignParentBottom=
"true"
android:layout_centerHorizontal=
"true"
android:layout_marginBottom=
"@dimen/dp_20
"
android:src=
"@drawable/dialog_draw_btn_select
"
/>
</RelativeLayout>
android:layout_marginBottom=
"30dp
"
android:src=
"@drawable/icon_dialog_iknow
"
/>
</RelativeLayout>
</LinearLayout>
</FrameLayout>
\ No newline at end of file
<ImageView
android:id=
"@+id/id_img_dialog_close"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_gravity=
"right"
android:src=
"@mipmap/icon_new_close"
/>
</FrameLayout>
</LinearLayout>
\ No newline at end of file
app/src/main/res/layout/item_watering_task.xml
View file @
030cb772
...
...
@@ -46,7 +46,7 @@
android:layout_width=
"150dp"
android:layout_height=
"10dp"
android:layout_marginRight=
"6dp"
android:progressDrawable=
"@drawable/user_progressbar_bg"
/>
android:progressDrawable=
"@drawable/user_
item_
progressbar_bg"
/>
<TextView
android:id=
"@+id/tv_watering_item_progess"
...
...
app/src/main/res/layout/item_with_draw_list.xml
View file @
030cb772
...
...
@@ -66,7 +66,7 @@
style=
"?android:attr/progressBarStyleHorizontal"
android:layout_width=
"match_parent"
android:layout_height=
"15dp"
android:progressDrawable=
"@drawable/user_progressbar_bg"
/>
android:progressDrawable=
"@drawable/user_
item_
progressbar_bg"
/>
<TextView
android:id=
"@+id/id_tv_jindu"
...
...
game/src/main/res/drawable/unity_static_splash.png
0 → 100644
View file @
030cb772
393 KB
library/src/main/java/com/ym/library/utils/FilterUtils.kt
View file @
030cb772
...
...
@@ -32,7 +32,7 @@ object FilterUtils {
*/
private
fun
setFilter
(
view
:
ImageView
)
{
//先获取设置的src图片
var
drawable
:
Drawable
=
view
?.
getDrawable
()
var
drawable
:
Drawable
?
=
view
?.
getDrawable
()
//当src图片为Null,获取背景图片
if
(
drawable
==
null
)
{
drawable
=
view
?.
getBackground
()
...
...
@@ -48,7 +48,7 @@ object FilterUtils {
*/
private
fun
removeFilter
(
view
:
ImageView
)
{
//先获取设置的src图片
var
drawable
:
Drawable
=
view
?.
getDrawable
()
var
drawable
:
Drawable
?
=
view
?.
getDrawable
()
//当src图片为Null,获取背景图片
if
(
drawable
==
null
)
{
drawable
=
view
?.
getBackground
()
...
...
library/src/main/res/layout/dialog_layout_red_pg_doubled.xml
View file @
030cb772
...
...
@@ -34,7 +34,7 @@
android:layout_height=
"88dp"
android:layout_centerHorizontal=
"true"
android:layout_marginTop=
"66dp"
android:src=
"@drawable/icon_
coin
"
/>
android:src=
"@drawable/icon_
dialog_get_cash_red_pg_bg
"
/>
<com.ym.library.widget.FontTextView
android:id=
"@+id/tv_red_pg_reward"
...
...
userinfo/src/main/java/com/ym/userinfo/module/activity/UserInfoActivity.kt
View file @
030cb772
...
...
@@ -103,7 +103,6 @@ class UserInfoActivity : BaseActivity(), View.OnClickListener,
adapter2
=
WithdrawAdapter
(
this
,
object
:
OnRecycleItemClickListener
<
WithdrawEntity
>
{
override
fun
onItemClick
(
view
:
View
,
position
:
Int
,
data
:
WithdrawEntity
)
{
mData2
=
data
adapter2
?.
setSelectPosition
(
position
)
adapter2
?.
notifyDataSetChanged
()
setWirhdrawDescription2
(
data
)
...
...
@@ -174,7 +173,19 @@ class UserInfoActivity : BaseActivity(), View.OnClickListener,
mWithdrawNum
=
0.3
}
EventUtils
.
onEvent
(
"user_withdraw_btn_click"
,
"立即提现按钮点击"
)
mPresenter
?.
requestIsWxBind
()
// mPresenter?.requestIsWxBind()
if
(
mData
?.
ifUse
==
1
||
mData2
?.
ifUse
==
1
)
{
Toast
.
makeText
(
this
@UserInfoActivity
,
"已提现"
,
Toast
.
LENGTH_SHORT
).
show
()
}
else
{
if
(
adapter
?.
getSelectPosition
()
!=
-
1
&&
mData
?.
id
!=
null
)
{
mPresenter
?.
requestWxWithdraw
(
mData
?.
id
!!
)
}
else
if
(
adapter2
?.
getSelectPosition
()
!=
-
1
&&
mData2
?.
id
!=
null
)
{
mPresenter
?.
requestWxWithdraw
(
mData2
?.
id
!!
)
}
else
{
Toast
.
makeText
(
this
@UserInfoActivity
,
"请选择提现额度"
,
Toast
.
LENGTH_SHORT
)
.
show
()
}
}
}
}
}
...
...
@@ -215,12 +226,12 @@ class UserInfoActivity : BaseActivity(), View.OnClickListener,
if
(
adapter
?.
getSelectPosition
()
!=
-
1
)
{
mData
=
datas
[
adapter
?.
getSelectPosition
()
!!
]
setWirhdrawDescription
(
datas
[
adapter
?.
getSelectPosition
()
!!
])
setWirhdrawDescription
(
mAdapterList
[
adapter
?.
getSelectPosition
()
!!
])
}
if
(
adapter2
?.
getSelectPosition
()
!=
-
1
)
{
mData2
=
datas
[
adapter2
?.
getSelectPosition
()
!!
]
setWirhdrawDescription2
(
datas
[
adapter2
?.
getSelectPosition
()
!!
])
setWirhdrawDescription2
(
mAdapterList2
[
adapter2
?.
getSelectPosition
()
!!
])
}
...
...
@@ -404,6 +415,10 @@ class UserInfoActivity : BaseActivity(), View.OnClickListener,
adapter2
?.
setSelectPosition
(-
1
)
adapter2
?.
notifyDataSetChanged
()
layout_user_withdraw_description2
.
visibility
=
View
.
GONE
if
(
data
?.
ifUse
!=
1
)
{
mData
=
data
mData2
=
null
if
(
data
.
status
==
1
)
{
//不显示提现说明
if
(
data
.
type
==
1
)
{
tv_user_withdraw_description_1
.
text
=
Html
.
fromHtml
(
data
.
desc
)
...
...
@@ -417,54 +432,43 @@ class UserInfoActivity : BaseActivity(), View.OnClickListener,
layout_user_withdraw_description
.
visibility
=
View
.
GONE
}
else
{
layout_user_withdraw_description
.
visibility
=
View
.
VISIBLE
tv_user_withdraw_description_1
.
text
=
Html
.
fromHtml
(
data
.
ext
?.
title
?:
""
)
tv_user_withdraw_description_2
.
text
=
Html
.
fromHtml
(
data
.
ext
?.
desc
?:
""
)
tv_user_withdraw_description_1
.
text
=
Html
.
fromHtml
(
data
.
ext
?.
title
)
tv_user_withdraw_description_2
.
text
=
Html
.
fromHtml
(
data
.
ext
?.
desc
)
tv_user_withdraw_status
.
text
=
"${data?.ext?.clock}"
if
(
data
.
type
==
4
)
{
id_iv_withdraw_description_icon
?.
setImageResource
(
R
.
drawable
.
icon_user_withdraw_unreceive
)
}
else
if
(
data
.
type
==
2
)
{
id_iv_withdraw_description_icon
?.
setImageResource
(
R
.
drawable
.
icon_user_withdraw_receive
)
}
else
if
(
data
.
type
==
5
)
{
id_iv_withdraw_description_icon
?.
setImageResource
(
R
.
drawable
.
icon_user_order
)
}
if
(
data
?.
ext
?.
max
!=
null
)
{
if
(
data
?.
ext
?.
current
!=
null
)
{
pb_withdraw_task
.
progress
=
data
.
ext
?.
current
?:
0
}
pb_withdraw_task
.
max
=
data
.
ext
?.
max
?:
0
}
if
(
data
.
type
==
1
||
data
.
type
==
3
)
{
layout_user_withdraw_description_progress
.
visibility
=
View
.
GONE
}
if
((
data
.
ext
?.
current
?:
0
)
>=
(
data
.
ext
?.
max
?:
0
))
{
pb_withdraw_task
.
progress
=
data
.
ext
?.
max
?:
0
tv_user_withdraw_status
.
text
=
"已完成"
}
else
{
pb_withdraw_task
.
progress
=
data
.
ext
!!
.
current
!!
when
(
data
.
type
)
{
2
->
{
layout_user_withdraw_description_progress
.
visibility
=
View
.
VISIBLE
if
(
data
.
ext
?.
clockStatus
==
0
)
{
tv_user_withdraw_status
.
text
=
"今日未打卡"
}
else
{
tv_user_withdraw_status
.
text
=
"今日已打卡"
}
}
4
->
{
layout_user_withdraw_description_progress
.
visibility
=
View
.
VISIBLE
if
(
data
.
ext
!!
.
current
!!
>=
data
.
ext
!!
.
max
!!
)
{
pb_withdraw_task
.
progress
=
data
.
ext
!!
.
max
!!
}
else
{
pb_withdraw_task
.
progress
=
data
.
ext
!!
.
current
!!
tv_user_withdraw_status
.
text
=
"领钻石"
}
}
}
}
tv_user_withdraw_status
.
setOnClickListener
{
when
(
data
.
type
)
{
// 1 -> 新手专享
2
->
JumpUtils
.
jumpClockInWithdrawActivity
()
4
->
JumpUtils
.
jumpWelfareActivity
()
5
->
finish
()
}
}
}
}
}
else
{
layout_user_withdraw_description
.
visibility
=
View
.
GONE
}
}
//设置提现说明
...
...
@@ -473,6 +477,9 @@ class UserInfoActivity : BaseActivity(), View.OnClickListener,
adapter
?.
notifyDataSetChanged
()
layout_user_withdraw_description
.
visibility
=
View
.
GONE
if
(
data
?.
ifUse
!=
1
)
{
mData2
=
data
mData
=
null
if
(
data
.
status
==
1
)
{
//不显示提现说明
if
(
data
.
type
==
1
)
{
tv_user_withdraw_description_11
.
text
=
Html
.
fromHtml
(
data
.
desc
)
...
...
@@ -486,14 +493,14 @@ class UserInfoActivity : BaseActivity(), View.OnClickListener,
layout_user_withdraw_description2
.
visibility
=
View
.
GONE
}
else
{
layout_user_withdraw_description2
.
visibility
=
View
.
VISIBLE
tv_user_withdraw_description_11
.
text
=
Html
.
fromHtml
(
data
.
ext
?.
title
?:
""
)
tv_user_withdraw_description_22
.
text
=
Html
.
fromHtml
(
data
.
ext
?.
desc
?:
""
)
tv_user_withdraw_description_11
.
text
=
Html
.
fromHtml
(
data
.
ext
?.
title
?:
""
)
tv_user_withdraw_description_22
.
text
=
Html
.
fromHtml
(
data
.
ext
?.
desc
?:
""
)
if
(
data
.
type
==
4
)
{
id_iv_withdraw_description_icon2
?.
setImageResource
(
R
.
drawable
.
icon_user_withdraw_unreceive
)
}
else
if
(
data
.
type
==
2
)
{
id_iv_withdraw_description_icon2
?.
setImageResource
(
R
.
drawable
.
icon_user_withdraw_receive
)
}
pb_withdraw_task2
.
max
=
data
.
ext
?.
max
?:
0
pb_withdraw_task2
.
max
=
data
.
ext
?.
max
?:
0
if
(
data
.
type
==
1
||
data
.
type
==
3
)
{
layout_user_withdraw_description_progress2
.
visibility
=
View
.
GONE
...
...
@@ -521,6 +528,9 @@ class UserInfoActivity : BaseActivity(), View.OnClickListener,
tv_user_withdraw_status2
.
text
=
"领钻石"
}
}
5
->
{
}
}
}
...
...
@@ -532,7 +542,9 @@ class UserInfoActivity : BaseActivity(), View.OnClickListener,
}
}
}
}
}
else
{
layout_user_withdraw_description2
.
visibility
=
View
.
GONE
}
}
...
...
userinfo/src/main/res/drawable-xhdpi/icon_user_order.png
0 → 100644
View file @
030cb772
7.69 KB
userinfo/src/main/res/drawable/user_item_progressbar_bg.xml
0 → 100644
View file @
030cb772
<?xml version="1.0" encoding="UTF-8"?>
<layer-list
xmlns:android=
"http://schemas.android.com/apk/res/android"
>
<!-- 设置背景色 -->
<item
android:id=
"@android:id/background"
>
<shape>
<corners
android:radius=
"8dp"
/>
<solid
android:color=
"#A45D33"
/>
</shape>
</item>
<!-- 设置进度条颜色 -->
<item
android:id=
"@android:id/progress"
>
<clip>
<shape>
<corners
android:radius=
"8dp"
/>
<solid
android:color=
"#94CA46"
/>
</shape>
</clip>
</item>
</layer-list>
\ No newline at end of file
userinfo/src/main/res/drawable/user_progressbar_bg.xml
View file @
030cb772
...
...
@@ -3,8 +3,8 @@
<!-- 设置背景色 -->
<item
android:id=
"@android:id/background"
>
<shape>
<corners
android:radius=
"
8
dp"
/>
<solid
android:color=
"#
A45D33
"
/>
<corners
android:radius=
"
6
dp"
/>
<solid
android:color=
"#
B0B0B0
"
/>
</shape>
</item>
...
...
@@ -12,8 +12,8 @@
<item
android:id=
"@android:id/progress"
>
<clip>
<shape>
<corners
android:radius=
"
8
dp"
/>
<solid
android:color=
"#
94CA46
"
/>
<corners
android:radius=
"
6
dp"
/>
<solid
android:color=
"#
FAA002
"
/>
</shape>
</clip>
</item>
...
...
userinfo/src/main/res/layout/activity_user_info.xml
View file @
030cb772
...
...
@@ -12,9 +12,11 @@
android:layout_height=
"match_parent"
>
<LinearLayout
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:orientation=
"vertical"
>
android:orientation=
"vertical"
android:paddingBottom=
"70dp"
>
<RelativeLayout
android:id=
"@+id/id_rl_userinfo_toolbar"
...
...
@@ -55,8 +57,7 @@
<LinearLayout
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:orientation=
"vertical"
android:paddingBottom=
"16dp"
>
android:orientation=
"vertical"
>
<LinearLayout
android:layout_width=
"match_parent"
...
...
@@ -273,10 +274,11 @@
<ProgressBar
android:id=
"@+id/pb_withdraw_task"
style=
"?android:attr/progressBarStyleHorizontal"
android:layout_width=
"1
6
0dp"
android:layout_height=
"
9
dp"
android:layout_width=
"1
5
0dp"
android:layout_height=
"
12
dp"
android:max=
"100"
android:progress=
"0"
/>
android:progress=
"0"
android:progressDrawable=
"@drawable/user_progressbar_bg"
/>
</LinearLayout>
<TextView
...
...
@@ -387,10 +389,11 @@
<ProgressBar
android:id=
"@+id/pb_withdraw_task2"
style=
"?android:attr/progressBarStyleHorizontal"
android:layout_width=
"1
6
0dp"
android:layout_height=
"
9
dp"
android:layout_width=
"1
5
0dp"
android:layout_height=
"
12
dp"
android:max=
"100"
android:progress=
"0"
/>
android:progress=
"0"
android:progressDrawable=
"@drawable/user_progressbar_bg"
/>
</LinearLayout>
<TextView
...
...
@@ -413,7 +416,6 @@
android:layout_marginLeft=
"7dp"
android:layout_marginTop=
"10dp"
android:layout_marginRight=
"7dp"
android:layout_marginBottom=
"50dp"
android:background=
"@drawable/icon_user_bg"
android:orientation=
"vertical"
android:paddingLeft=
"20dp"
...
...
@@ -456,7 +458,6 @@
android:layout_marginLeft=
"7dp"
android:layout_marginTop=
"15dp"
android:layout_marginRight=
"7dp"
android:layout_marginBottom=
"16dp"
android:src=
"@drawable/icon_user_big_withdraw_btn_txt3"
/>
</FrameLayout>
\ No newline at end of file
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