Skip to content

R
RvApp
Commit 2a3aef45 authored by jianglx's avatar jianglx
Browse files
Options

Merge branch 'master' of http://113.105.137.151:22280/lify/rvapp into dev-member-john

parents 9f4c019a f280b770
Show whitespace changes
Inline Side-by-side
Showing with 320 additions and 340 deletions
module_mine/src/main/java/com/rv/rvmine/MineFragment.java
View file @ 2a3aef45
...@@ -86,13 +86,11 @@ public class MineFragment extends BaseFragment<CommonPresenter> implements Simpl ...@@ -86,13 +86,11 @@ public class MineFragment extends BaseFragment<CommonPresenter> implements Simpl
TextView tvLogin; TextView tvLogin;
@BindView(R2.id.tv_verified) @BindView(R2.id.tv_verified)
TextView tvVerified; TextView tvVerified;
@BindView(R2.id.iv_notification)
ImageView ivNotification;
@BindView(R2.id.tv_membership_level) @BindView(R2.id.tv_membership_level)
TextView tvMembershipLevel; TextView tvMembershipLevel;
@BindView(R2.id.tv_member_hint) @BindView(R2.id.tv_member_hint)
TextView tvMemberHint; TextView tvMemberHint;
@BindView(R2.id.tv_view_privileges) @BindView(R2.id.tv_item_view_privileges)
TextView tvViewPrivileges; TextView tvViewPrivileges;
@BindView(R2.id.rl_item_to_be_paid) @BindView(R2.id.rl_item_to_be_paid)
RelativeLayout rlItemToBePaid; RelativeLayout rlItemToBePaid;
...@@ -102,14 +100,8 @@ public class MineFragment extends BaseFragment<CommonPresenter> implements Simpl ...@@ -102,14 +100,8 @@ public class MineFragment extends BaseFragment<CommonPresenter> implements Simpl
RelativeLayout rlItemTraveling; RelativeLayout rlItemTraveling;
@BindView(R2.id.rl_item_completed) @BindView(R2.id.rl_item_completed)
RelativeLayout rlItemCompleted; RelativeLayout rlItemCompleted;
@BindView(R2.id.rl_item_all)
RelativeLayout rlItemAll;
@BindView(R2.id.rl_item_collection) @BindView(R2.id.rl_item_collection)
RelativeLayout rlItemCollection; RelativeLayout rlItemCollection;
@BindView(R2.id.rl_item_personal_information)
RelativeLayout rlItemPersonalInformation;
@BindView(R2.id.rl_item_setting)
RelativeLayout rlItemSetting;
@BindView(R2.id.travel_fragment_layout) @BindView(R2.id.travel_fragment_layout)
LinearLayout travelFragmentLayout; LinearLayout travelFragmentLayout;
@BindView(R2.id.mine_banner) @BindView(R2.id.mine_banner)
...@@ -174,6 +166,7 @@ public class MineFragment extends BaseFragment<CommonPresenter> implements Simpl ...@@ -174,6 +166,7 @@ public class MineFragment extends BaseFragment<CommonPresenter> implements Simpl
} }
@SuppressLint("CheckResult") @SuppressLint("CheckResult")
private void initRxBus() { private void initRxBus() {
...@@ -198,14 +191,19 @@ public class MineFragment extends BaseFragment<CommonPresenter> implements Simpl ...@@ -198,14 +191,19 @@ 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, @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.rl_item_traveling, R2.id.rl_item_completed, R2.id.rl_item_all, R2.id.rl_item_collection, R2.id.rl_item_personal_information, R2.id.rl_item_traveling, R2.id.rl_item_completed, R2.id.rl_item_collection,
R2.id.rl_item_setting, R2.id.rl_item_driver, R2.id.rl_item_traveler, 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.tv_view_privileges, R2.id.rl_item_share, R2.id.rl_item_coupon, R2.id.rl_item_points, R2.id.rl_item_wallet}) 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();
if (id == R.id.iv_avatar) { if (id == R.id.iv_item_setting){
//设置
if (isLogin()) return;
startActivityForResult(SettingActivity.getIntent(_mActivity), 101);
}else if (id == R.id.iv_avatar) {
//头像 //头像
if (isLogin()) return; if (isLogin()) return;
startActivity(PersonalInformationActivity.getIntent(_mActivity, info));
} else if (id == R.id.tv_login) { } else if (id == R.id.tv_login) {
//登录 //登录
...@@ -217,6 +215,40 @@ public class MineFragment extends BaseFragment<CommonPresenter> implements Simpl ...@@ -217,6 +215,40 @@ public class MineFragment extends BaseFragment<CommonPresenter> implements Simpl
startActivity(IDCardCertificationActivity.getIntent(_mActivity)); startActivity(IDCardCertificationActivity.getIntent(_mActivity));
}else if (id == R.id.ll_item_integral){
//积分
if (isLogin()) return;
startActivity(new Intent(_mActivity, PointsActivity.class));
}else if (id == R.id.ll_item_wallet){
//钱包
if (isLogin()) return;
ARouter.getInstance()
.build(Constance.ACTIVITY_URL_WALLET)
.navigation();
}else if (id == R.id.ll_item_coupon){
//优惠券
if (isLogin()) return;
ARouter.getInstance()
.build(Constance.ACTIVITY_URL_COUPONALL)
.navigation();
}else if (id == R.id.ll_item_promotion){
//推广有奖
if (isLogin()) return;
startActivity(new Intent(_mActivity, ShareActivity.class));
} else if (id == R.id.tv_item_view_privileges) {
//会员中心
if (isLogin()) return;
startActivity(MemberCenterActivity.getIntent(_mActivity));
} else if (id == R.id.rl_item_order_all) {
//全部
if (isLogin()) return;
startActivity(OrderListActivity.getIntent(_mActivity, 4));
} else if (id == R.id.rl_item_to_be_paid) { } else if (id == R.id.rl_item_to_be_paid) {
//待支付 //待支付
if (isLogin()) return; if (isLogin()) return;
...@@ -237,59 +269,31 @@ public class MineFragment extends BaseFragment<CommonPresenter> implements Simpl ...@@ -237,59 +269,31 @@ public class MineFragment extends BaseFragment<CommonPresenter> implements Simpl
if (isLogin()) return; if (isLogin()) return;
startActivity(OrderListActivity.getIntent(_mActivity, 3)); startActivity(OrderListActivity.getIntent(_mActivity, 3));
} else if (id == R.id.rl_item_all) {
//全部
if (isLogin()) return;
startActivity(OrderListActivity.getIntent(_mActivity, 4));
} else if (id == R.id.rl_item_my_release) { } else if (id == R.id.rl_item_my_release) {
//我的发布 //我的发布
if (isLogin()) return; if (isLogin()) return;
} else if (id == R.id.rl_item_collection) { } else if (id == R.id.rl_item_collection) {
//收藏 //收藏
if (isLogin()) return; if (isLogin()) return;
startActivity(CollectionActivity.getIntent(_mActivity)); startActivity(CollectionActivity.getIntent(_mActivity));
} else if (id == R.id.rl_item_personal_information) { }else if (id == R.id.rl_item_check_in){
//个人资料 //签到
if (isLogin()) return; if (isLogin()) return;
startActivity(PersonalInformationActivity.getIntent(_mActivity, info));
} else if (id == R.id.rl_item_setting) { }else if (id ==R.id.rl_item_travel_management){
//设置 //出游管理
if (isLogin()) return;
startActivityForResult(SettingActivity.getIntent(_mActivity), 101);
} else if (id == R.id.rl_item_driver) {
//驾驶人
if (isLogin()) return;
startActivity(DrivingListActivity.getIntent(_mActivity, null));
} else if (id == R.id.rl_item_traveler) {
//出游人
if (isLogin()) return; if (isLogin()) return;
startActivity(new Intent(_mActivity, ChooseAVisitorActivity.class)); startActivity(new Intent(_mActivity, ChooseAVisitorActivity.class));
} }
// else if (id == R.id.rl_item_my_pat) {
// //我的拍拍 // } else if (id == R.id.rl_item_driver) {
// } // //驾驶人
else if (id == R.id.tv_view_privileges) { // if (isLogin()) return;
startActivity(MemberCenterActivity.getIntent(_mActivity)); // startActivity(DrivingListActivity.getIntent(_mActivity, null));
} else if (id == R.id.rl_item_coupon) {
ARouter.getInstance()
.build(Constance.ACTIVITY_URL_COUPONALL)
.navigation();
} else if (id == R.id.rl_item_share) {
if (isLogin()) return;
startActivity(new Intent(_mActivity, ShareActivity.class));
} else if (id == R.id.rl_item_points) {
if (isLogin()) return;
startActivity(new Intent(_mActivity, PointsActivity.class));
} else if (id == R.id.rl_item_wallet) {
ARouter.getInstance()
.build(Constance.ACTIVITY_URL_WALLET)
.navigation();
}
} }
@Override @Override
...@@ -305,7 +309,7 @@ public class MineFragment extends BaseFragment<CommonPresenter> implements Simpl ...@@ -305,7 +309,7 @@ public class MineFragment extends BaseFragment<CommonPresenter> implements Simpl
tvUserIdentity.setVisibility(View.GONE); tvUserIdentity.setVisibility(View.GONE);
tvViewPrivileges.setText("会员中心"); tvViewPrivileges.setText("会员中心");
tvMembershipLevel.setText("会员特权"); tvMembershipLevel.setText("会员特权");
tvMemberHint.setText("免费用车7天"); tvMemberHint.setText("免费用车- -天");
} }
} }
...@@ -434,7 +438,7 @@ public class MineFragment extends BaseFragment<CommonPresenter> implements Simpl ...@@ -434,7 +438,7 @@ public class MineFragment extends BaseFragment<CommonPresenter> implements Simpl
if (0 == info.getIsMember()) { if (0 == info.getIsMember()) {
tvMembershipLevel.setText("会员特权"); tvMembershipLevel.setText("会员特权");
tvMemberHint.setText("免费用车7天"); tvMemberHint.setText("免费用车- -天");
tvMember.setText("普通用户"); tvMember.setText("普通用户");
} else if (1 == info.getIsMember()) { } else if (1 == info.getIsMember()) {
if (1 == info.getMemberLevel()) { //1 普通会员 2 黄金会员 3 钻石会员 if (1 == info.getMemberLevel()) { //1 普通会员 2 黄金会员 3 钻石会员
......
module_mine/src/main/res/layout/activity_mine.xml
View file @ 2a3aef45
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@color/colorLine"
android:orientation="vertical"> android:orientation="vertical">
<com.ruiwenliu.wrapper.weight.refresh.SimpleRefreshLayout <com.ruiwenliu.wrapper.weight.refresh.SimpleRefreshLayout
...@@ -13,14 +14,12 @@ ...@@ -13,14 +14,12 @@
<ScrollView <ScrollView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="match_parent">
<LinearLayout <LinearLayout
android:id="@+id/travel_fragment_layout" android:id="@+id/travel_fragment_layout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0dp" android:layout_height="match_parent"
android:layout_weight="1"
android:background="@color/colorLine"
android:orientation="vertical"> android:orientation="vertical">
<RelativeLayout <RelativeLayout
...@@ -30,17 +29,48 @@ ...@@ -30,17 +29,48 @@
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="190dp" android:layout_height="190dp"
android:background="@drawable/mycenter_image_bg"> android:background="@drawable/mycenter_image_bg"
android:orientation="vertical">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/size_10"
android:layout_marginLeft="@dimen/size_8"
android:layout_marginRight="@dimen/size_8"
android:orientation="horizontal">
<ImageView
android:id="@+id/iv_item_setting"
android:layout_width="@dimen/size_35"
android:layout_height="@dimen/size_35"
android:padding="@dimen/size_8"
android:src="@drawable/mycenter_icon_setting"/>
<ImageView
android:id="@+id/iv_item_message"
android:layout_width="@dimen/size_35"
android:layout_height="@dimen/size_35"
android:layout_alignParentRight="true"
android:padding="@dimen/size_8"
android:src="@drawable/mycenter_icon_message"/>
</RelativeLayout>
</LinearLayout>
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/size_70" android:layout_height="@dimen/size_200"
android:layout_marginLeft="@dimen/size_15" android:layout_marginLeft="@dimen/size_15"
android:layout_marginTop="@dimen/size_70" android:layout_marginTop="@dimen/size_70"
android:layout_marginRight="@dimen/size_15" android:layout_marginRight="@dimen/size_15"
android:gravity="center_vertical" android:background="@drawable/shape_rv_bg_write"
android:orientation="horizontal"> android:orientation="vertical"
android:padding="@dimen/size_10">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<com.base.utils.ui.image.round.RoundImageView <com.base.utils.ui.image.round.RoundImageView
android:id="@+id/iv_avatar" android:id="@+id/iv_avatar"
...@@ -48,12 +78,12 @@ ...@@ -48,12 +78,12 @@
android:layout_height="@dimen/size_60" android:layout_height="@dimen/size_60"
android:src="@drawable/common_icon_avatar_default" /> android:src="@drawable/common_icon_avatar_default" />
<LinearLayout <LinearLayout
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="@dimen/size_60"
android:layout_marginLeft="@dimen/size_15" android:layout_marginLeft="@dimen/size_15"
android:layout_weight="1" android:layout_weight="1"
android:gravity="center_vertical"
android:orientation="vertical"> android:orientation="vertical">
<LinearLayout <LinearLayout
...@@ -65,9 +95,11 @@ ...@@ -65,9 +95,11 @@
android:id="@+id/tv_nickname" android:id="@+id/tv_nickname"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textColor="@color/colorYellow" android:singleLine="true"
android:textSize="@dimen/text_16" android:ellipsize="end"
android:visibility="gone" /> android:visibility="gone"
android:textColor="@color/colorMain"
android:textSize="@dimen/text_16" />
<TextView <TextView
android:id="@+id/tv_user_identity" android:id="@+id/tv_user_identity"
...@@ -76,13 +108,13 @@ ...@@ -76,13 +108,13 @@
android:layout_marginLeft="@dimen/size_5" android:layout_marginLeft="@dimen/size_5"
android:background="@drawable/common_icon_user_type" android:background="@drawable/common_icon_user_type"
android:maxLines="1" android:maxLines="1"
android:visibility="gone"
android:paddingLeft="@dimen/size_3" android:paddingLeft="@dimen/size_3"
android:paddingTop="@dimen/size_1" android:paddingTop="@dimen/size_1"
android:paddingRight="@dimen/size_3" android:paddingRight="@dimen/size_3"
android:paddingBottom="@dimen/size_1" android:paddingBottom="@dimen/size_1"
android:textColor="@color/colorGray" android:textColor="@color/colorGray"
android:textSize="@dimen/text_10" android:textSize="@dimen/text_10" />
android:visibility="gone" />
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
...@@ -103,51 +135,156 @@ ...@@ -103,51 +135,156 @@
android:layout_height="@dimen/size_15" android:layout_height="@dimen/size_15"
android:layout_marginLeft="@dimen/size_2" android:layout_marginLeft="@dimen/size_2"
android:gravity="center" android:gravity="center"
android:textColor="@color/gray_f5f5f5" android:textColor="@color/colorMain"
android:textSize="@dimen/text_10" /> android:textSize="@dimen/text_10" />
</LinearLayout> </LinearLayout>
<TextView <TextView
android:id="@+id/tv_login" android:id="@+id/tv_login"
android:layout_width="@dimen/size_150" android:layout_width="wrap_content"
android:layout_height="@dimen/size_40" android:layout_height="match_parent"
android:layout_gravity="center" android:layout_gravity="center_vertical"
android:background="@drawable/resource_drawable_shape_yellow_line" android:paddingRight="@dimen/size_30"
android:gravity="center" android:gravity="center_vertical"
android:text="@string/tv_login" android:text="点击登录"
android:textColor="@color/colorYellow" android:textColor="@color/colorYellow"
android:textSize="@dimen/text_14" android:textSize="@dimen/text_16"
android:visibility="visible" /> android:visibility="visible" />
</LinearLayout> </LinearLayout>
<TextView <TextView
android:id="@+id/tv_verified" android:id="@+id/tv_verified"
android:layout_width="@dimen/text_90" android:layout_width="wrap_content"
android:layout_height="@dimen/text_30" android:layout_height="wrap_content"
android:background="@drawable/resource_drawable_shape_yellow_line" android:layout_gravity="center"
android:gravity="center" android:drawableRight="@drawable/common_icon_rig_gray"
android:drawablePadding="@dimen/size_3"
android:text="未实名认证" android:text="未实名认证"
android:textColor="@color/colorYellow" android:textColor="@color/text_Gray"
android:textSize="@dimen/text_12" android:textSize="@dimen/text_12"
android:visibility="gone" /> android:visibility="gone" />
</LinearLayout> </LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
android:layout_marginTop="@dimen/size_10"
android:gravity="center_vertical"
android:orientation="horizontal">
<LinearLayout
android:id="@+id/ll_item_integral"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="积分"
android:textColor="@color/textGray"
android:textSize="@dimen/text_12" />
<TextView
android:id="@+id/tv_integral"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/size_8"
android:text="0"
android:textColor="@color/colorMain"
android:textSize="@dimen/text_16"
android:textStyle="bold" />
</LinearLayout>
<LinearLayout
android:id="@+id/ll_item_wallet"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="钱包"
android:textColor="@color/textGray"
android:textSize="@dimen/text_12" />
<TextView
android:id="@+id/tv_wallet"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/size_8"
android:text="0"
android:textColor="@color/colorMain"
android:textSize="@dimen/text_16"
android:textStyle="bold" />
</LinearLayout>
<LinearLayout
android:id="@+id/ll_item_coupon"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="优惠券"
android:textColor="@color/textGray"
android:textSize="@dimen/text_12" />
<TextView
android:id="@+id/tv_coupon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/size_8"
android:text="0"
android:textColor="@color/colorMain"
android:textSize="@dimen/text_16"
android:textStyle="bold" />
</LinearLayout> </LinearLayout>
<LinearLayout
android:id="@+id/ll_item_promotion"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
android:orientation="vertical">
<ImageView <ImageView
android:id="@+id/iv_notification" android:layout_width="@dimen/size_25"
android:layout_height="@dimen/size_25"
android:src="@drawable/mycenter_icon_promotion"
android:textColor="@color/textGray"
android:textSize="@dimen/text_12" />
<TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentRight="true" android:layout_marginTop="@dimen/size_8"
android:layout_marginTop="@dimen/size_20" android:text="推广有奖"
android:layout_marginRight="@dimen/size_15" android:textColor="@color/colorMain"
android:src="@drawable/mycenter_icon_news" /> android:textSize="@dimen/text_12" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
</RelativeLayout>
<LinearLayout <LinearLayout
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"
android:layout_marginTop="@dimen/size_15"
android:layout_marginLeft="@dimen/size_15" android:layout_marginLeft="@dimen/size_15"
android:layout_marginRight="@dimen/size_15" android:layout_marginRight="@dimen/size_15"
android:layout_marginBottom="@dimen/size_15" android:layout_marginBottom="@dimen/size_15"
...@@ -172,6 +309,7 @@ ...@@ -172,6 +309,7 @@
android:id="@+id/tv_membership_level" android:id="@+id/tv_membership_level"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textStyle="bold"
android:text="会员特权" android:text="会员特权"
android:textColor="@color/colorMain" android:textColor="@color/colorMain"
android:textSize="@dimen/text_14" /> android:textSize="@dimen/text_14" />
...@@ -181,37 +319,42 @@ ...@@ -181,37 +319,42 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/size_2" android:layout_marginTop="@dimen/size_2"
android:text="免费用车7天" android:text="免费用车- -天"
android:textColor="@color/colorMain" android:textColor="@color/colorMain"
android:textSize="@dimen/text_10" /> android:textSize="@dimen/text_10" />
</LinearLayout> </LinearLayout>
<TextView <TextView
android:id="@+id/tv_view_privileges" android:id="@+id/tv_item_view_privileges"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginRight="@dimen/size_15" android:layout_marginRight="@dimen/size_15"
android:drawableRight="@drawable/common_icon_rig_black" android:drawableRight="@drawable/common_icon_rig_black"
android:drawablePadding="@dimen/size_8" android:drawablePadding="@dimen/size_8"
android:gravity="center_vertical" android:gravity="center_vertical"
android:textStyle="bold"
android:text="会员中心" android:text="会员中心"
android:textColor="@color/colorMain" android:textColor="@color/colorMain"
android:textSize="@dimen/text_12" /> android:textSize="@dimen/text_12" />
</LinearLayout> </LinearLayout>
</RelativeLayout>
<!--我的订单--> <!--我的订单-->
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@color/colorWrite" android:background="@drawable/shape_rv_bg_write"
android:layout_marginLeft="@dimen/size_15"
android:layout_marginRight="@dimen/size_15"
android:orientation="vertical" android:orientation="vertical"
android:paddingLeft="@dimen/size_15" android:paddingLeft="@dimen/size_15"
android:paddingTop="@dimen/size_15" android:paddingTop="@dimen/size_15"
android:paddingRight="@dimen/size_15"> android:paddingRight="@dimen/size_15">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
...@@ -219,6 +362,19 @@ ...@@ -219,6 +362,19 @@
android:textColor="@color/colorMain" android:textColor="@color/colorMain"
android:textSize="@dimen/text_16" /> android:textSize="@dimen/text_16" />
<TextView
android:id="@+id/rl_item_order_all"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:drawablePadding="@dimen/size_8"
android:paddingLeft="@dimen/size_30"
android:layout_centerVertical="true"
android:drawableRight="@drawable/common_icon_rig_gray"
android:textSize="@dimen/text_12"
android:textColor="@color/text_Gray"
android:text="查看全部"/>
</RelativeLayout>
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
...@@ -245,7 +401,7 @@ ...@@ -245,7 +401,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:layout_marginTop="@dimen/size_18" android:layout_marginTop="@dimen/size_10"
android:text="@string/tv_to_be_paid" android:text="@string/tv_to_be_paid"
android:textColor="@color/colorMain" android:textColor="@color/colorMain"
android:textSize="@dimen/size_12" /> android:textSize="@dimen/size_12" />
...@@ -322,30 +478,6 @@ ...@@ -322,30 +478,6 @@
android:textColor="@color/colorMain" android:textColor="@color/colorMain"
android:textSize="@dimen/size_12" /> android:textSize="@dimen/size_12" />
</RelativeLayout> </RelativeLayout>
<RelativeLayout
android:id="@+id/rl_item_all"
android:layout_width="0dp"
android:layout_height="@dimen/size_60"
android:layout_weight="1"
android:gravity="center_horizontal"
android:orientation="vertical">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:src="@drawable/mycenter_icon_whole" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:text="@string/tv_all"
android:textColor="@color/colorMain"
android:textSize="@dimen/size_12" />
</RelativeLayout>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
...@@ -354,7 +486,9 @@ ...@@ -354,7 +486,9 @@
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_15" android:layout_marginTop="@dimen/size_15"
android:background="@color/colorWrite" android:background="@drawable/shape_rv_bg_write"
android:layout_marginLeft="@dimen/size_15"
android:layout_marginRight="@dimen/size_15"
android:orientation="horizontal" android:orientation="horizontal"
android:paddingTop="@dimen/size_25" android:paddingTop="@dimen/size_25"
android:paddingBottom="@dimen/size_15"> android:paddingBottom="@dimen/size_15">
...@@ -408,7 +542,7 @@ ...@@ -408,7 +542,7 @@
</RelativeLayout> </RelativeLayout>
<RelativeLayout <RelativeLayout
android:id="@+id/rl_item_personal_information" android:id="@+id/rl_item_check_in"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="@dimen/size_60" android:layout_height="@dimen/size_60"
android:layout_weight="1" android:layout_weight="1"
...@@ -418,7 +552,7 @@ ...@@ -418,7 +552,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:src="@drawable/mycenter_icon_personal_data" /> android:src="@drawable/mycenter_icon_personal_" />
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
...@@ -426,13 +560,13 @@ ...@@ -426,13 +560,13 @@
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:layout_marginTop="@dimen/size_18" android:layout_marginTop="@dimen/size_18"
android:text="@string/tv_personal_information" android:text="签到"
android:textColor="@color/colorMain" android:textColor="@color/colorMain"
android:textSize="@dimen/size_12" /> android:textSize="@dimen/size_12" />
</RelativeLayout> </RelativeLayout>
<RelativeLayout <RelativeLayout
android:id="@+id/rl_item_setting" android:id="@+id/rl_item_travel_management"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="@dimen/size_60" android:layout_height="@dimen/size_60"
android:layout_weight="1" android:layout_weight="1"
...@@ -442,7 +576,7 @@ ...@@ -442,7 +576,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:src="@drawable/mycenter_icon_notes" /> android:src="@drawable/mycenter_icon_travel_management" />
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
...@@ -450,179 +584,21 @@ ...@@ -450,179 +584,21 @@
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:layout_marginTop="@dimen/size_18" android:layout_marginTop="@dimen/size_18"
android:text="@string/tv_setting" android:text="出游管理"
android:textColor="@color/colorMain"
android:textSize="@dimen/size_12" />
</RelativeLayout>
<RelativeLayout
android:id="@+id/rl_item_driver"
android:layout_width="0dp"
android:layout_height="@dimen/size_60"
android:layout_weight="1"
android:orientation="vertical">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:src="@drawable/mycenter_icon_driver" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:layout_marginTop="@dimen/size_18"
android:text="@string/tv_driver"
android:textColor="@color/colorMain" android:textColor="@color/colorMain"
android:textSize="@dimen/size_12" /> android:textSize="@dimen/size_12" />
</RelativeLayout> </RelativeLayout>
</LinearLayout> </LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/colorWrite"
android:orientation="horizontal"
android:paddingTop="@dimen/size_3"
android:paddingBottom="@dimen/size_15">
<RelativeLayout
android:id="@+id/rl_item_traveler"
android:layout_width="0dp"
android:layout_height="@dimen/size_60"
android:layout_weight="1"
android:orientation="vertical">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:src="@drawable/mycenter_icon_visitors" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:layout_marginTop="@dimen/size_18"
android:text="@string/tv_traveler"
android:textColor="@color/colorMain"
android:textSize="@dimen/size_12" />
</RelativeLayout>
<RelativeLayout
android:id="@+id/rl_item_coupon"
android:layout_width="0dp"
android:layout_height="@dimen/size_60"
android:layout_weight="1"
android:orientation="vertical">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:src="@drawable/mycenter_icon_visitors" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:layout_marginTop="@dimen/size_18"
android:text="优惠券"
android:textColor="@color/colorMain"
android:textSize="@dimen/size_12" />
</RelativeLayout>
<RelativeLayout
android:id="@+id/rl_item_share"
android:layout_width="0dp"
android:layout_height="@dimen/size_60"
android:layout_weight="1"
android:orientation="vertical">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:src="@drawable/mycenter_icon_visitors" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:layout_marginTop="@dimen/size_18"
android:text="分享有礼"
android:textColor="@color/colorMain"
android:textSize="@dimen/size_12" />
</RelativeLayout>
<RelativeLayout
android:id="@+id/rl_item_points"
android:layout_width="0dp"
android:layout_height="@dimen/size_60"
android:layout_weight="1"
android:orientation="vertical">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:src="@drawable/mycenter_icon_visitors" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:layout_marginTop="@dimen/size_18"
android:text="积分"
android:textColor="@color/colorMain"
android:textSize="@dimen/size_12" />
</RelativeLayout>
<RelativeLayout
android:id="@+id/rl_item_wallet"
android:layout_width="0dp"
android:layout_height="@dimen/size_60"
android:layout_weight="1"
android:orientation="vertical">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:src="@drawable/mycenter_icon_visitors" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:layout_marginTop="@dimen/size_18"
android:text="钱包"
android:textColor="@color/colorMain"
android:textSize="@dimen/size_12" />
</RelativeLayout>
</LinearLayout>
<com.yuyife.banner.Banner <com.yuyife.banner.Banner
android:id="@+id/mine_banner" android:id="@+id/mine_banner"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_marginLeft="@dimen/size_15"
android:layout_marginRight="@dimen/size_15"
android:layout_height="@dimen/size_100" android:layout_height="@dimen/size_100"
android:layout_marginTop="@dimen/size_15" /> android:layout_marginTop="@dimen/size_15" />
</LinearLayout> </LinearLayout>
</ScrollView> </ScrollView>
</com.ruiwenliu.wrapper.weight.refresh.SimpleRefreshLayout> </com.ruiwenliu.wrapper.weight.refresh.SimpleRefreshLayout>
</LinearLayout> </LinearLayout>
\ No newline at end of file
plugin_wallet/src/main/res/layout/activity_wallet.xml
View file @ 2a3aef45
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
tools:context=".activity.WalletActivity"> tools:context=".activity.WalletActivity">
<LinearLayout <LinearLayout
android:background="@color/colorYellow" android:background="@drawable/icon_wallet_bg"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/size_220" android:layout_height="@dimen/size_220"
android:orientation="vertical"> android:orientation="vertical">
......
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