Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
R
RvApp
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
1
Merge Requests
1
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
lify
RvApp
Commits
f28ee4aa
Commit
f28ee4aa
authored
Oct 12, 2019
by
jianglx
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
会员中心最新修改
parent
023ed80f
Changes
9
Show whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
34 additions
and
27 deletions
+34
-27
MineFragment.java
module_mine/src/main/java/com/rv/rvmine/MineFragment.java
+2
-2
activity_mine.xml
module_mine/src/sit/res/layout/activity_mine.xml
+1
-0
GridMemerAdapter.java
...src/main/java/com/rv.member/adapter/GridMemerAdapter.java
+2
-2
MemberTopView.java
...ember/src/main/java/com/rv.member/view/MemberTopView.java
+2
-1
activity_member.xml
plugin_member/src/main/res/layout/activity_member.xml
+2
-2
item_login_view.xml
plugin_member/src/main/res/layout/item_login_view.xml
+8
-8
item_member_detail.xml
plugin_member/src/main/res/layout/item_member_detail.xml
+3
-2
item_member_detail_view.xml
...in_member/src/main/res/layout/item_member_detail_view.xml
+2
-2
view_member_privilege.xml
plugin_member/src/main/res/layout/view_member_privilege.xml
+12
-8
No files found.
module_mine/src/main/java/com/rv/rvmine/MineFragment.java
View file @
f28ee4aa
...
@@ -255,7 +255,7 @@ public class MineFragment extends BaseFragment<CommonPresenter> implements Simpl
...
@@ -255,7 +255,7 @@ public class MineFragment extends BaseFragment<CommonPresenter> implements Simpl
@OnClick
({
R2
.
id
.
iv_avatar
,
R2
.
id
.
tv_login
,
R2
.
id
.
tv_verified
,
R2
.
id
.
rl_item_to_be_paid
,
R2
.
id
.
rl_item_staying
,
R2
.
id
.
iv_item_message
,
@OnClick
({
R2
.
id
.
iv_avatar
,
R2
.
id
.
tv_login
,
R2
.
id
.
tv_verified
,
R2
.
id
.
rl_item_to_be_paid
,
R2
.
id
.
rl_item_staying
,
R2
.
id
.
iv_item_message
,
R2
.
id
.
rl_item_traveling
,
R2
.
id
.
rl_item_completed
,
R2
.
id
.
rl_item_collection
,
R2
.
id
.
rl_item_my_release
,
R2
.
id
.
rl_item_traveling
,
R2
.
id
.
rl_item_completed
,
R2
.
id
.
rl_item_collection
,
R2
.
id
.
rl_item_my_release
,
R2
.
id
.
iv_item_setting
,
R2
.
id
.
tv
_item_view_privileges
,
R2
.
id
.
rl_item_order_all
,
R2
.
id
.
ll_item_integral
,
R2
.
id
.
ll_item_wallet
,
R2
.
id
.
iv_item_setting
,
R2
.
id
.
ll
_item_view_privileges
,
R2
.
id
.
rl_item_order_all
,
R2
.
id
.
ll_item_integral
,
R2
.
id
.
ll_item_wallet
,
R2
.
id
.
ll_item_coupon
,
R2
.
id
.
ll_item_promotion
,
R2
.
id
.
rl_item_check_in
,
R2
.
id
.
rl_item_travel_management
})
R2
.
id
.
ll_item_coupon
,
R2
.
id
.
ll_item_promotion
,
R2
.
id
.
rl_item_check_in
,
R2
.
id
.
rl_item_travel_management
})
public
void
onViewClicked
(
View
view
)
{
public
void
onViewClicked
(
View
view
)
{
int
id
=
view
.
getId
();
int
id
=
view
.
getId
();
...
@@ -316,7 +316,7 @@ public class MineFragment extends BaseFragment<CommonPresenter> implements Simpl
...
@@ -316,7 +316,7 @@ public class MineFragment extends BaseFragment<CommonPresenter> implements Simpl
if
(
isLogin
())
return
;
if
(
isLogin
())
return
;
startActivity
(
new
Intent
(
_mActivity
,
ShareActivity
.
class
));
startActivity
(
new
Intent
(
_mActivity
,
ShareActivity
.
class
));
}
else
if
(
id
==
R
.
id
.
tv
_item_view_privileges
)
{
}
else
if
(
id
==
R
.
id
.
ll
_item_view_privileges
)
{
//会员中心
//会员中心
startActivity
(
MemberCenterActivity
.
getIntent
(
_mActivity
));
startActivity
(
MemberCenterActivity
.
getIntent
(
_mActivity
));
...
...
module_mine/src/sit/res/layout/activity_mine.xml
View file @
f28ee4aa
...
@@ -292,6 +292,7 @@
...
@@ -292,6 +292,7 @@
</RelativeLayout>
</RelativeLayout>
<LinearLayout
<LinearLayout
android:id=
"@+id/ll_item_view_privileges"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"@dimen/size_50"
android:layout_height=
"@dimen/size_50"
android:layout_alignParentBottom=
"true"
android:layout_alignParentBottom=
"true"
...
...
plugin_member/src/main/java/com/rv.member/adapter/GridMemerAdapter.java
View file @
f28ee4aa
...
@@ -74,10 +74,10 @@ public class GridMemerAdapter extends BaseAdapter {
...
@@ -74,10 +74,10 @@ public class GridMemerAdapter extends BaseAdapter {
holder
=
(
ViewHolder
)
view
.
getTag
();
holder
=
(
ViewHolder
)
view
.
getTag
();
}
}
SpannableString
s
=
new
SpannableString
(
"¥"
+
memberCard
.
getPrice
());
SpannableString
s
=
new
SpannableString
(
"¥
"
+
memberCard
.
getPrice
());
s
.
setSpan
(
new
AbsoluteSizeSpan
(
10
,
true
),
0
,
1
,
Spanned
.
SPAN_EXCLUSIVE_EXCLUSIVE
);
s
.
setSpan
(
new
AbsoluteSizeSpan
(
10
,
true
),
0
,
1
,
Spanned
.
SPAN_EXCLUSIVE_EXCLUSIVE
);
s
.
setSpan
(
new
AbsoluteSizeSpan
(
18
,
true
),
1
,
s
.
length
(),
Spanned
.
SPAN_EXCLUSIVE_EXCLUSIVE
);
s
.
setSpan
(
new
AbsoluteSizeSpan
(
20
,
true
),
1
,
s
.
length
(),
Spanned
.
SPAN_EXCLUSIVE_EXCLUSIVE
);
if
(
selecPosition
==
i
)
{
if
(
selecPosition
==
i
)
{
s
.
setSpan
(
new
ForegroundColorSpan
(
Color
.
parseColor
(
"#ffffff"
)),
0
,
s
.
length
(),
Spanned
.
SPAN_EXCLUSIVE_EXCLUSIVE
);
s
.
setSpan
(
new
ForegroundColorSpan
(
Color
.
parseColor
(
"#ffffff"
)),
0
,
s
.
length
(),
Spanned
.
SPAN_EXCLUSIVE_EXCLUSIVE
);
...
...
plugin_member/src/main/java/com/rv.member/view/MemberTopView.java
View file @
f28ee4aa
...
@@ -7,6 +7,7 @@ import android.graphics.Color;
...
@@ -7,6 +7,7 @@ import android.graphics.Color;
import
android.text.SpannableString
;
import
android.text.SpannableString
;
import
android.text.Spanned
;
import
android.text.Spanned
;
import
android.text.TextUtils
;
import
android.text.TextUtils
;
import
android.text.style.AbsoluteSizeSpan
;
import
android.text.style.ForegroundColorSpan
;
import
android.text.style.ForegroundColorSpan
;
import
android.util.AttributeSet
;
import
android.util.AttributeSet
;
import
android.view.LayoutInflater
;
import
android.view.LayoutInflater
;
...
@@ -125,7 +126,7 @@ public class MemberTopView extends LinearLayout {
...
@@ -125,7 +126,7 @@ public class MemberTopView extends LinearLayout {
private
void
setHeadViewData
()
{
private
void
setHeadViewData
()
{
setMemeberTop
();
setMemeberTop
();
SpannableString
spannableString
=
new
SpannableString
(
tv_agreement
.
getText
());
SpannableString
spannableString
=
new
SpannableString
(
tv_agreement
.
getText
());
spannableString
.
setSpan
(
new
ForegroundColorSpan
(
Color
.
parseColor
(
"#309EFF"
)),
4
,
spannableString
.
length
(),
Spanned
.
SPAN_EXCLUSIVE_EXCLUSIVE
);
spannableString
.
setSpan
(
new
ForegroundColorSpan
(
Color
.
parseColor
(
"#309EFF"
)),
3
,
spannableString
.
length
(),
Spanned
.
SPAN_EXCLUSIVE_EXCLUSIVE
);
tv_agreement
.
setText
(
spannableString
);
tv_agreement
.
setText
(
spannableString
);
tv_agreement
.
setOnClickListener
(
new
View
.
OnClickListener
()
{
tv_agreement
.
setOnClickListener
(
new
View
.
OnClickListener
()
{
@Override
@Override
...
...
plugin_member/src/main/res/layout/activity_member.xml
View file @
f28ee4aa
...
@@ -28,8 +28,8 @@
...
@@ -28,8 +28,8 @@
<LinearLayout
<LinearLayout
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginTop=
"@dimen/size_
8
"
android:layout_marginTop=
"@dimen/size_
12
"
android:layout_marginBottom=
"@dimen/size_
8
"
android:layout_marginBottom=
"@dimen/size_
12
"
android:gravity=
"center"
android:gravity=
"center"
android:orientation=
"horizontal"
>
android:orientation=
"horizontal"
>
...
...
plugin_member/src/main/res/layout/item_login_view.xml
View file @
f28ee4aa
...
@@ -26,17 +26,17 @@
...
@@ -26,17 +26,17 @@
android:layout_centerVertical=
"true"
android:layout_centerVertical=
"true"
android:layout_toRightOf=
"@id/iv_avatar"
android:layout_toRightOf=
"@id/iv_avatar"
android:ellipsize=
"end"
android:ellipsize=
"end"
android:
maxLength=
"10
"
android:
singleLine=
"true
"
android:
text=
"xxxxxx
"
android:
layout_toLeftOf=
"@+id/iv_member_level
"
android:textColor=
"@color/white"
android:textColor=
"@color/white"
android:textSize=
"17sp"
/>
android:textSize=
"17sp"
/>
<ImageView
<ImageView
android:id=
"@+id/iv_member_level"
android:id=
"@+id/iv_member_level"
android:layout_width=
"@dimen/size_6
0
"
android:layout_width=
"@dimen/size_6
5
"
android:layout_height=
"@dimen/size_6
0
"
android:layout_height=
"@dimen/size_6
5
"
android:layout_alignParentRight=
"true"
android:layout_alignParentRight=
"true"
android:layout_marginRight=
"@dimen/size_
30
"
/>
android:layout_marginRight=
"@dimen/size_
25
"
/>
</RelativeLayout>
</RelativeLayout>
...
@@ -59,7 +59,7 @@
...
@@ -59,7 +59,7 @@
android:lines=
"2"
android:lines=
"2"
android:text=
"0 \n 消费记录 "
android:text=
"0 \n 消费记录 "
android:textColor=
"@color/white"
android:textColor=
"@color/white"
android:textSize=
"@dimen/
text
_10"
/>
android:textSize=
"@dimen/
dp
_10"
/>
<View
<View
android:layout_width=
"1px"
android:layout_width=
"1px"
...
@@ -76,7 +76,7 @@
...
@@ -76,7 +76,7 @@
android:lines=
"2"
android:lines=
"2"
android:text=
"0 \n 可免费租车 (天) "
android:text=
"0 \n 可免费租车 (天) "
android:textColor=
"@color/white"
android:textColor=
"@color/white"
android:textSize=
"@dimen/
text
_10"
/>
android:textSize=
"@dimen/
dp
_10"
/>
<View
<View
android:layout_width=
"1px"
android:layout_width=
"1px"
...
@@ -93,7 +93,7 @@
...
@@ -93,7 +93,7 @@
android:lines=
"2"
android:lines=
"2"
android:text=
"0 \n 购买记录 (次)"
android:text=
"0 \n 购买记录 (次)"
android:textColor=
"@color/white"
android:textColor=
"@color/white"
android:textSize=
"@dimen/
text
_10"
/>
android:textSize=
"@dimen/
dp
_10"
/>
</LinearLayout>
</LinearLayout>
...
...
plugin_member/src/main/res/layout/item_member_detail.xml
View file @
f28ee4aa
...
@@ -70,6 +70,7 @@
...
@@ -70,6 +70,7 @@
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginLeft=
"@dimen/size_20"
android:layout_marginLeft=
"@dimen/size_20"
android:layout_marginRight=
"@dimen/size_20"
android:layout_marginRight=
"@dimen/size_20"
android:lineSpacingMultiplier=
"1.5"
android:textColor=
"#666666"
android:textColor=
"#666666"
android:layout_marginBottom=
"13dp"
android:layout_marginBottom=
"13dp"
android:textSize=
"@dimen/dp_10"
/>
android:textSize=
"@dimen/dp_10"
/>
...
@@ -90,10 +91,10 @@
...
@@ -90,10 +91,10 @@
<View
<View
android:id=
"@+id/view_line"
android:id=
"@+id/view_line"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"1
dp
"
android:layout_height=
"1
px
"
android:layout_marginLeft=
"13dp"
android:layout_marginLeft=
"13dp"
android:layout_marginRight=
"13dp"
android:layout_marginRight=
"13dp"
android:background=
"#
cccccc
"
/>
android:background=
"#
eee
"
/>
</LinearLayout>
</LinearLayout>
plugin_member/src/main/res/layout/item_member_detail_view.xml
View file @
f28ee4aa
...
@@ -31,14 +31,14 @@
...
@@ -31,14 +31,14 @@
android:layout_marginTop=
"@dimen/dp_10"
android:layout_marginTop=
"@dimen/dp_10"
android:layout_marginBottom=
"@dimen/size_5"
android:layout_marginBottom=
"@dimen/size_5"
android:textColor=
"@color/white"
android:textColor=
"@color/white"
android:textSize=
"@dimen/
text_10
"
/>
android:textSize=
"@dimen/
sp_12
"
/>
<TextView
<TextView
android:id=
"@+id/tv_free_day"
android:id=
"@+id/tv_free_day"
android:layout_width=
"wrap_content"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:textColor=
"@color/white"
android:textColor=
"@color/white"
android:textSize=
"@dimen/
text_10
"
/>
android:textSize=
"@dimen/
sp_12
"
/>
<TextView
<TextView
...
...
plugin_member/src/main/res/layout/view_member_privilege.xml
View file @
f28ee4aa
...
@@ -26,10 +26,10 @@
...
@@ -26,10 +26,10 @@
android:layout_height=
"@dimen/size_50"
/>
android:layout_height=
"@dimen/size_50"
/>
<TextView
<TextView
android:textColor=
"#333333"
android:id=
"@+id/tv_discount_top"
android:id=
"@+id/tv_discount_top"
android:layout_width=
"wrap_content"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:textColor=
"#333333"
android:textSize=
"@dimen/text_12"
/>
android:textSize=
"@dimen/text_12"
/>
<Button
<Button
...
@@ -40,6 +40,7 @@
...
@@ -40,6 +40,7 @@
android:layout_marginBottom=
"@dimen/size_8"
android:layout_marginBottom=
"@dimen/size_8"
android:background=
"@drawable/shape_member_bg_btn_yellow"
android:background=
"@drawable/shape_member_bg_btn_yellow"
android:gravity=
"center"
android:gravity=
"center"
android:stateListAnimator=
"@null"
android:text=
"@string/tv_use_now"
android:text=
"@string/tv_use_now"
android:textColor=
"@color/white"
android:textColor=
"@color/white"
android:textSize=
"@dimen/sp_12"
/>
android:textSize=
"@dimen/sp_12"
/>
...
@@ -63,10 +64,10 @@
...
@@ -63,10 +64,10 @@
android:paddingRight=
"@dimen/size_5"
/>
android:paddingRight=
"@dimen/size_5"
/>
<TextView
<TextView
android:textColor=
"#333333"
android:id=
"@+id/tv_freeday_top"
android:id=
"@+id/tv_freeday_top"
android:layout_width=
"wrap_content"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:textColor=
"#333333"
android:textSize=
"@dimen/text_12"
/>
android:textSize=
"@dimen/text_12"
/>
<Button
<Button
...
@@ -77,6 +78,7 @@
...
@@ -77,6 +78,7 @@
android:layout_marginBottom=
"@dimen/size_8"
android:layout_marginBottom=
"@dimen/size_8"
android:background=
"@drawable/shape_member_bg_btn_yellow"
android:background=
"@drawable/shape_member_bg_btn_yellow"
android:gravity=
"center"
android:gravity=
"center"
android:stateListAnimator=
"@null"
android:text=
"@string/tv_use_now"
android:text=
"@string/tv_use_now"
android:textColor=
"@color/white"
android:textColor=
"@color/white"
android:textSize=
"@dimen/sp_12"
/>
android:textSize=
"@dimen/sp_12"
/>
...
@@ -98,11 +100,11 @@
...
@@ -98,11 +100,11 @@
android:src=
"@drawable/member_icon_free"
/>
android:src=
"@drawable/member_icon_free"
/>
<TextView
<TextView
android:textColor=
"#333333"
android:id=
"@+id/tv_free_top"
android:id=
"@+id/tv_free_top"
android:layout_width=
"wrap_content"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:text=
"@string/tv_outdoors_act"
android:text=
"@string/tv_outdoors_act"
android:textColor=
"#333333"
android:textSize=
"@dimen/text_12"
/>
android:textSize=
"@dimen/text_12"
/>
<Button
<Button
...
@@ -113,6 +115,7 @@
...
@@ -113,6 +115,7 @@
android:background=
"@drawable/shape_rv_bg_member_top_grap"
android:background=
"@drawable/shape_rv_bg_member_top_grap"
android:enabled=
"false"
android:enabled=
"false"
android:gravity=
"center"
android:gravity=
"center"
android:stateListAnimator=
"@null"
android:text=
"@string/tv_please_wait"
android:text=
"@string/tv_please_wait"
android:textColor=
"@color/white"
android:textColor=
"@color/white"
android:textSize=
"@dimen/sp_12"
/>
android:textSize=
"@dimen/sp_12"
/>
...
@@ -129,7 +132,7 @@
...
@@ -129,7 +132,7 @@
android:layout_marginTop=
"5dp"
android:layout_marginTop=
"5dp"
android:layout_marginRight=
"@dimen/dp_10"
android:layout_marginRight=
"@dimen/dp_10"
android:layout_marginBottom=
"@dimen/dp_10"
android:layout_marginBottom=
"@dimen/dp_10"
android:background=
"#
CCCCCC
"
/>
android:background=
"#
eee
"
/>
<GridView
<GridView
...
@@ -144,7 +147,7 @@
...
@@ -144,7 +147,7 @@
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginTop=
"7dp"
android:layout_marginTop=
"7dp"
android:gravity=
"center_vertical"
android:gravity=
"center_vertical
|right
"
android:orientation=
"horizontal"
>
android:orientation=
"horizontal"
>
<ImageView
<ImageView
...
@@ -158,11 +161,12 @@
...
@@ -158,11 +161,12 @@
<TextView
<TextView
android:id=
"@+id/tv_agreement"
android:id=
"@+id/tv_agreement"
android:layout_width=
"
match_par
ent"
android:layout_width=
"
wrap_cont
ent"
android:layout_height=
"@dimen/size_30"
android:layout_height=
"@dimen/size_30"
android:gravity=
"left|center_vertical"
android:gravity=
"center_vertical"
android:layout_marginRight=
"@dimen/dp_10"
android:text=
"@string/tv_agreement"
android:text=
"@string/tv_agreement"
android:textSize=
"@dimen/
text_10
"
/>
android:textSize=
"@dimen/
sp_12
"
/>
</LinearLayout>
</LinearLayout>
...
...
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